Fixed file deletion; stopped &s in names