changed some search heuristics to be optimal based on tournaments