AREA/DATA: Updated the area and data files so they all mesh.