diff --git a/src/com/ixab/ConfigHandling/StreamConfigItem.java b/src/com/ixab/ConfigHandling/StreamConfigItem.java
index 0c920b7..ae76810 100644
--- a/src/com/ixab/ConfigHandling/StreamConfigItem.java
+++ b/src/com/ixab/ConfigHandling/StreamConfigItem.java
@@ -1,5 +1,6 @@
 package com.ixab.ConfigHandling;
 
+import com.ixab.Logging.Logger;
 import com.ixab.StreamHandling.StreamInfo;
 
 import java.awt.image.BufferedImage;
@@ -32,6 +33,7 @@ public class StreamConfigItem implements Serializable {
         this.category = StreamInfo.getGame();
     }
     public void refreshInfo() {
+        Logger.print("Refreshing stream data for " + this.name, this);
         this.getInfo();
     }
 
diff --git a/src/com/ixab/GUI/MainWindow.java b/src/com/ixab/GUI/MainWindow.java
index 35eee71..fcd6b4e 100644
--- a/src/com/ixab/GUI/MainWindow.java
+++ b/src/com/ixab/GUI/MainWindow.java
@@ -6,6 +6,7 @@ import com.ixab.ConfigHandling.StreamConfigItem;
 import com.ixab.ConfigHandling.StreamConfigSorter;
 import com.ixab.Logging.Logger;
 import com.ixab.StreamHandling.StreamOpener;
+import javafx.event.EventDispatcher;
 
 import javax.swing.*;
 import java.awt.event.*;
@@ -202,7 +203,7 @@ public class MainWindow {
         }
         if (o != null) {
             comboBoxStreams.setSelectedItem(o);
-        } else {
+        } else if (comboBoxStreams.getItemCount()>0) {
             comboBoxStreams.setSelectedIndex(0);
         }
     }
diff --git a/src/com/ixab/GUI/SettingsWindow.form b/src/com/ixab/GUI/SettingsWindow.form
index fe1767b..4687d3c 100644
--- a/src/com/ixab/GUI/SettingsWindow.form
+++ b/src/com/ixab/GUI/SettingsWindow.form
@@ -65,12 +65,12 @@
               <text value="Pfad zu Livestreamer:"/>
             </properties>
           </component>
-          <component id="42a4f" class="javax.swing.JCheckBox" binding="debugmodusCheckBox" default-binding="true">
+          <component id="42a4f" class="javax.swing.JCheckBox" binding="nichtImplementiertCheckBox" default-binding="true">
             <constraints>
               <grid row="1" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties>
-              <text value=""/>
+              <text value=" (nicht implementiert)"/>
             </properties>
           </component>
           <component id="e34b3" class="javax.swing.JLabel">
diff --git a/src/com/ixab/GUI/SettingsWindow.java b/src/com/ixab/GUI/SettingsWindow.java
index 884dcb2..5a09ba8 100644
--- a/src/com/ixab/GUI/SettingsWindow.java
+++ b/src/com/ixab/GUI/SettingsWindow.java
@@ -11,7 +11,7 @@ public class SettingsWindow extends JDialog {
     private JPanel contentPane;
     private JButton buttonOK;
     private JButton buttonCancel;
-    private JCheckBox debugmodusCheckBox;
+    private JCheckBox nichtImplementiertCheckBox;
     private JTextField textField1;
     private JButton suchenButton;
     private JTextField twitchBenutzernameTextField;