Added more switches; Filenames to output