fix up stuff