cleaned up many definitions/proofs.