Revert "Revert "Improve GPS""

This reverts commit 690f4a66b5364e7621182b1968441d90917f2e35.