fixed gamesettings
merged