misc fixes to filenames and syntax