corrected all path/fnames