Added sequence to waypoints and improved importing