added code to read waypoint list and misc changes

-corrected typos
-rearranged code for proper order of events
-adjusted variables for current location