waypoints; leaks and perfomance