Geocoding update
Smaller updates to functions
Change to city hall