making use of the new google map api to fix some old warts...