cleaning up some junk, and adding a few missing files