fixed up geolocation stuff a bit