Added comments to Evaluator; fixed output