benchmark_grade calculation fixes