minor tweaks, added a few evals