fixed some bugs with game setup