more stuff + game state
Merge pull request #16 from jrahm/master

more stuff + game state