more clean up with game.  It is more modular now, other modules will be looked at and cleaned up.