More changes to eval. Beats eval1 and eval2. And matt.