updated first XinARow Heuristic, logic fixes