bug fixes on the map