Added benchmarking, output hooks and waypoint loop.