Fixed some typos with the evaluation.
Merged with head