further tweaks to eval procedure