reorganising a bit
enough to solve the zugzwang like puzzle and to behave well in matches