Add actual waypoints and fix sub-hour sim resolutions