Added info, updated the map, other basic stuff