fix to SinglePlayerGUI and some more test...