fixpoint |-> fixed point (consistency)
enact some of Shayan's suggestions
address some more of Shayan's comments