Eval bug fix, some work on tuning.