missing stuff i owed
Add database storage for waypoints
fixed editing
Merge more changes from James