Fixing some logic flaws in calculating right/wrong moves