fixed up some more stuff.
cleanup