Improved the benchmark tool greatly.