Update waypoints and fix bombing on state change