some fixes
some fixes
Main game class