Better benchmarks, misc changes