Made corrections to components sitting beneath evaluator.