Fixing adding too many files, mistakes in InputFile