Fix crash on draw

some cleanup
support larger game board size
although 5x5 seems pretty silly?