minor fixes; change how fixpoint works