move some of the proofs forward
merge changes