Fixed many issues with benchmarking code.  Updated perf scripts to work with new changes.