Refine eval. Refine search. Fix some bugs while doing so