grading fixes