added zoom control to map
bug fix in map optimization