CleanUp
Fix GPS