fix up some more