added waypoints, other changes