GeoLocation, Map and small fixes