Added world map, redid parser