more proofs, lot of cleanup, univalence...