fixed geolocation and other bugs