Fixed the issues and added the game-part