minor changes.
Merged.
Improved the MarkerView, merged stuff.