Adjusted some n-1-type cases, and now gold moves check out