various changes to how the map works