Added the Game, fixed some NPEs