few fixes, more waypoint pruning