added Waze maps, fixed Google Maps