diff --git a/Artemis/Artemis/App.config b/Artemis/Artemis/App.config
index d4dc18237..822069f5f 100644
--- a/Artemis/Artemis/App.config
+++ b/Artemis/Artemis/App.config
@@ -204,7 +204,7 @@
         <value>TypeWave</value>
       </setting>
       <setting name="LastKeyboard" serializeAs="String">
-        <value>Razer BlackWidow Chroma</value>
+        <value>Logitech G910 Orion Spark</value>
       </setting>
       <setting name="EnablePointersUpdate" serializeAs="String">
         <value>True</value>
diff --git a/Artemis/Artemis/AppBootStrapper.cs b/Artemis/Artemis/AppBootStrapper.cs
index a0ca2e72f..88f600375 100644
--- a/Artemis/Artemis/AppBootStrapper.cs
+++ b/Artemis/Artemis/AppBootStrapper.cs
@@ -1,6 +1,8 @@
-using System.Windows;
+using System;
+using System.Windows;
 using Artemis.ViewModels;
 using Caliburn.Micro;
+using MessageBox = System.Windows.Forms.MessageBox;
 
 namespace Artemis
 {
@@ -13,7 +15,16 @@ namespace Artemis
 
         protected override void OnStartup(object sender, StartupEventArgs e)
         {
-            DisplayRootViewFor<ShellViewModel>();
+            try
+            {
+                DisplayRootViewFor<ShellViewModel>();
+            }
+            catch (Exception ex)
+            {
+                MessageBox.Show("Startup failed :c \n" + ex.InnerException.Message);
+                throw;
+            }
+            
         }
     }
 }
\ No newline at end of file
diff --git a/Artemis/Artemis/KeyboardProviders/Logitech/Orion.cs b/Artemis/Artemis/KeyboardProviders/Logitech/Orion.cs
index a8ef91b11..5f01a31a2 100644
--- a/Artemis/Artemis/KeyboardProviders/Logitech/Orion.cs
+++ b/Artemis/Artemis/KeyboardProviders/Logitech/Orion.cs
@@ -1,4 +1,5 @@
-using System.Drawing;
+using System;
+using System.Drawing;
 using System.Threading;
 using Artemis.KeyboardProviders.Logitech.Utilities;
 
diff --git a/Artemis/Artemis/Settings/General.Designer.cs b/Artemis/Artemis/Settings/General.Designer.cs
index 26087df61..2a697fe80 100644
--- a/Artemis/Artemis/Settings/General.Designer.cs
+++ b/Artemis/Artemis/Settings/General.Designer.cs
@@ -37,7 +37,7 @@ namespace Artemis.Settings {
         
         [global::System.Configuration.UserScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("Razer BlackWidow Chroma")]
+        [global::System.Configuration.DefaultSettingValueAttribute("Logitech G910 Orion Spark")]
         public string LastKeyboard {
             get {
                 return ((string)(this["LastKeyboard"]));
diff --git a/Artemis/Artemis/Settings/General.settings b/Artemis/Artemis/Settings/General.settings
index 2faabad5f..8be4f33e3 100644
--- a/Artemis/Artemis/Settings/General.settings
+++ b/Artemis/Artemis/Settings/General.settings
@@ -6,7 +6,7 @@
       <Value Profile="(Default)">TypeWave</Value>
     </Setting>
     <Setting Name="LastKeyboard" Type="System.String" Scope="User">
-      <Value Profile="(Default)">Razer BlackWidow Chroma</Value>
+      <Value Profile="(Default)">Logitech G910 Orion Spark</Value>
     </Setting>
     <Setting Name="EnablePointersUpdate" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">True</Value>
diff --git a/Artemis/Artemis/Utilities/GameState/GameStateWebServer.cs b/Artemis/Artemis/Utilities/GameState/GameStateWebServer.cs
index ab197f934..30a21c494 100644
--- a/Artemis/Artemis/Utilities/GameState/GameStateWebServer.cs
+++ b/Artemis/Artemis/Utilities/GameState/GameStateWebServer.cs
@@ -31,8 +31,7 @@ namespace Artemis.Utilities.GameState
                 return;
 
             _listener.Prefixes.Clear();
-            //Port = FreeTcpPort();
-            Port = 5821;
+            Port = FreeTcpPort();
             _listener.Prefixes.Add($"http://127.0.0.1:{Port}/");
 
             _listener.Start();