Fixup local strategy

Loser plays first on play again
Other refactorings