diff --git a/qController.Standard/Classes/Communication/QReceiver.cs b/qController.Standard/Classes/Communication/QReceiver.cs
index 5e7847b..a49e159 100644
--- a/qController.Standard/Classes/Communication/QReceiver.cs
+++ b/qController.Standard/Classes/Communication/QReceiver.cs
@@ -53,8 +53,9 @@ namespace qController
         }
 
         public void Close(){
-            udpListener.Close();
+
             thread.Abort();
+            udpListener.Close();
         }
 
         protected virtual void OnUpdateMessageReceived(OscMessage msg)
diff --git a/qController.Standard/Classes/Settings/QStorage.cs b/qController.Standard/Classes/Settings/QStorage.cs
index 22ec66e..f92c9eb 100644
--- a/qController.Standard/Classes/Settings/QStorage.cs
+++ b/qController.Standard/Classes/Settings/QStorage.cs
@@ -21,7 +21,8 @@ namespace qController
 
         public static void AddInstance(string name, string address){
             if(!Contains(name,address)){
-                qInstances.Add(new QInstance(name, address));
+                AddInstance(new QInstance(name, address));
+                Console.WriteLine("Adding Instance: " + name + " @ " + address);
             }
         }
         public static void AddInstance(QInstance q){
diff --git a/qController.Standard/Pages/qControllerPage.xaml.cs b/qController.Standard/Pages/qControllerPage.xaml.cs
index f165776..2093aef 100644
--- a/qController.Standard/Pages/qControllerPage.xaml.cs
+++ b/qController.Standard/Pages/qControllerPage.xaml.cs
@@ -96,12 +96,6 @@ namespace qController
 			});
         }
 
-        void showToast(string message){
-            var toastConfig = new ToastConfig(message);
-            toastConfig.SetDuration(3000);
-            toastConfig.SetPosition(ToastPosition.Bottom);
-            UserDialogs.Instance.Toast(toastConfig);
-        }
 
         async void Scan(object sender, EventArgs e){
             bool workspacesFound = false;
@@ -129,5 +123,13 @@ namespace qController
             }
         }
 
+        void showToast(string message)
+        {
+            var toastConfig = new ToastConfig(message);
+            toastConfig.SetDuration(3000);
+            toastConfig.SetPosition(ToastPosition.Bottom);
+            UserDialogs.Instance.Toast(toastConfig);
+        }
+
     }
 }