Benchmark and minor changes in verifier