Misc updates
Merged game 2
Game 2