Added list of classes to GRADER & Fixed eval errors