removed mail
fixed problems with whitespaces in filename