Add Google Maps
a few changes to the maps implementation