Smaller fixes.
Make sure marker can't be moved out of the view.