Added waypoints; expanded custom-styling to the map.