Added gameover and recycling of game states; additional clean up fixes