Map Api fixes and development