Add a game window and fix a few option issues