fix up some of the hacky stuff I did