Added few pieces of evaluation, fixed minor errors