Improved benchmarking and added new benchmarks.