better benchmarking code, more benchmarks