various edits to bring uptodate with fixpoint