mostly fix up the module