Cleaned reading Waypoints a little
Fixed some stuff
Resolving Conflicts
Merge Branch