- Fixed stuff with the map