latest changes and fixes of map