Fixed up reading in of data files