Implemented part of the Game logic and fixed minor issues