Maybe fixed one of the problems; not looping waypoints.