Refactored, slightly improved, using tornado.gen from now on
A lot of cleanups
Tiny fixes
Merge branch 'refactor/game_logic_improvements'