BasicEvaluator fixes and improvements (fixed heuristic, added best-final-run)