Fix bugs in game, add draw