geolocation working a bit better