Updated version of the map

Updated version of the map with bug fixes etc. that nexis didn't merge