Adds new benchmarks and fixes some bugs