Updated MapMarkers. Closes #11 and closes #7.