handle filenames better