Refactoring, some sketched proofs and some new axioms here and there.