cleaning up filenames, etc.