Major improvements to the FileReaders.