fix up some more stuff