Fix up and extend benchmarks, add latest results