fixed lists of waypoints

state transitions are very iffy
turing behavior is prone to error