bug fixes on map