fix delete & filenames