Rewrote some proofs