Multiple grading-related changes + features