Geolocation added and major fix