file renames, misc fixes