Google Maps commit

Also other things.