waypoints bugfix; perfomance; rf