Added extra timing and timeouts to waypoint transmission