some more improvments on geolocation