Updated the GPS functions and other minor things