fix up main