Tightened up validations for infiles, and a couple small miscellaneous changes.