massive updates to benchmark code