Eval and Search Fixes