otw - Readded the waypoints for the planner.  Also touched them up a bit so it's easier to see what's going on...