Fix bugs, update benchmarks.