some more stuff.  Idc about the commit messages