Added Game class, Fixed bugs