Waypoint updates, logic tweaks