Cleaning up the Benchmark attribute, and a fair amount of comment updating.