More work on the input file reader