fix up all model stuff