Work on game and deals management
Some other small improvements and fixes