Minor updates and fix filenames