issues #400, #402, updated markers documentation a bunch