Fix wrong looping.
Few temp modifications. Will continue after my current main work the tic-tac game.