fix up some of the crazy