add grading events, minor tweeks