Bug fixes (file names are now ok)