Some updates to evaluation.