Added Google Maps support, debug cleanup.