Fix n starting at 0
Fix breaking when grade_level is nil