Improved benchmarking.
Merged