Fix last input name
Deal with persisting waypoints, and decide on terminology
Add some helpful links