adding checks, fixed grader