Made some changes to the map, need to fix bugs