Fixes to file reading - still mostly broken.