AI checkpoints and waypoints improved