Improving match ending/rematching

Finally perfected square grid and player stacks sizes