Minor fixes made durring the evaluation.