More changes to Theorem prover