addGrades/viewGrades fixes