Updated benchmarks

Plus some cleanup for v0.2.5.