add some missing files, more cleanup