Committed more stuff

little more fixes and whatnot