Update
Don't redraw markers every update
Fixes
Fixes