Add flags / code cleanup
Update Geolocation