Better precision for waypoints and added 3 waypoint maps