Expanded checks.
Fixed grader.