adding missing files, some cleanups