Minor tweaks, and finishing the eval system