added all the other checks
fixed grader to work