Google Map Improvements and bug fix