Fixed Create waypoints, and entry and exit points