fixing up the proofs and implementing cancellertac.
a few minor improvements to the tests.