Fix geolocation, update TODO