Enahancements to how the benchmarker works.