Lots of changes + prover listeners now get called