better waypoints and collision