added more benchmarks, and improved tools