Expanded waypoints; added information to InfoWindows; added custom markers.