GPS all done and code cleaned up