still waypoint imaging, fixing waypoint updating