diff --git a/Artemis/Artemis/KeyboardProviders/ProviderHelper.cs b/Artemis/Artemis/KeyboardProviders/ProviderHelper.cs
index 0e5483490..10bfa713b 100644
--- a/Artemis/Artemis/KeyboardProviders/ProviderHelper.cs
+++ b/Artemis/Artemis/KeyboardProviders/ProviderHelper.cs
@@ -12,8 +12,8 @@ namespace Artemis.KeyboardProviders
             return new List<KeyboardProvider>
             {
                 new Orion(),
-                new CorsairRGB(),
-                new BlackWidow()
+                new CorsairRGB()
+                //new BlackWidow()
             };
         }
     }
diff --git a/Artemis/Artemis/Models/MainModel.cs b/Artemis/Artemis/Models/MainModel.cs
index b40d165b1..4d3001d00 100644
--- a/Artemis/Artemis/Models/MainModel.cs
+++ b/Artemis/Artemis/Models/MainModel.cs
@@ -228,7 +228,7 @@ namespace Artemis.Models
             var sw = new Stopwatch();
             while (!_updateWorker.CancellationPending)
             {
-                if (ActiveKeyboard == null || Suspended)
+                if (ActiveKeyboard == null || Suspended || _activeEffect == null)
                 {
                     Thread.Sleep(1000/_fps);
                     continue;
diff --git a/Artemis/Artemis/Modules/Effects/AudioVisualizer/AudioVisualizerView.xaml b/Artemis/Artemis/Modules/Effects/AudioVisualizer/AudioVisualizerView.xaml
index 539452e50..942e68fe2 100644
--- a/Artemis/Artemis/Modules/Effects/AudioVisualizer/AudioVisualizerView.xaml
+++ b/Artemis/Artemis/Modules/Effects/AudioVisualizer/AudioVisualizerView.xaml
@@ -72,14 +72,14 @@
                               VerticalAlignment="Center" Margin="0,5,-1,5" Height="22" />
 
             <!-- Bar direction -->
-            <TextBlock Grid.Row="4" Grid.Column="0" HorizontalAlignment="Left" Width="116" VerticalAlignment="Center"
+            <TextBlock Grid.Row="4" Grid.Column="0" HorizontalAlignment="Left" VerticalAlignment="Center"
                        Height="16" Margin="0,9,0,10">
-                Grow bars bottom
+                Grow bars bottom (broken, sorry!)
             </TextBlock>
             <controls:ToggleSwitch IsChecked="{Binding Path=AudioVisualizerSettings.FromBottom, Mode=TwoWay}"
                                    Grid.Row="4" Grid.Column="1" HorizontalAlignment="Right" OnLabel="Yes"
                                    OffLabel="No"
-                                   Margin="0,0,-5,0" Width="114" />
+                                   Margin="0,0,-5,0" Width="114" IsEnabled="False"/>
 
             <!-- Bars amount -->
             <TextBlock Grid.Row="5" Grid.Column="0" HorizontalAlignment="Left" VerticalAlignment="Center"
diff --git a/Artemis/Artemis/Settings/GeneralSettings.cs b/Artemis/Artemis/Settings/GeneralSettings.cs
index 16d5d04df..b46e6d97d 100644
--- a/Artemis/Artemis/Settings/GeneralSettings.cs
+++ b/Artemis/Artemis/Settings/GeneralSettings.cs
@@ -40,7 +40,7 @@ namespace Artemis.Settings
 
         private void ApplyGamestatePort()
         {
-            // TODO: Restart Gamestate server
+            // TODO: Restart Gamestate server with new port
         }
 
         private void ApplyAutorun()
diff --git a/Artemis/Artemis/ViewModels/EffectsViewModel.cs b/Artemis/Artemis/ViewModels/EffectsViewModel.cs
index 8bc9e4b5c..8d193f416 100644
--- a/Artemis/Artemis/ViewModels/EffectsViewModel.cs
+++ b/Artemis/Artemis/ViewModels/EffectsViewModel.cs
@@ -17,7 +17,7 @@ namespace Artemis.ViewModels
         public EffectsViewModel(MainModel mainModel)
         {
             _typeWaveVm = new TypeWaveViewModel(mainModel) {DisplayName = "Type Waves"};
-            _typeHoleVm = new TypeHoleViewModel(mainModel) {DisplayName = "Type Holes (NYI)"};
+            //_typeHoleVm = new TypeHoleViewModel(mainModel) {DisplayName = "Type Holes (NYI)"};
             _audioVisualizerVm = new AudioVisualizerViewModel(mainModel) {DisplayName = "Audio Visualization"};
             _debugVm = new DebugEffectViewModel(mainModel) {DisplayName = "Debug Effect"};
         }
@@ -27,7 +27,7 @@ namespace Artemis.ViewModels
             base.OnActivate();
 
             ActivateItem(_typeWaveVm);
-            ActivateItem(_typeHoleVm);
+            //ActivateItem(_typeHoleVm);
             ActivateItem(_audioVisualizerVm);
             ActivateItem(_debugVm);
         }
diff --git a/Artemis/Artemis/ViewModels/GamesViewModel.cs b/Artemis/Artemis/ViewModels/GamesViewModel.cs
index 297517809..5588c0175 100644
--- a/Artemis/Artemis/ViewModels/GamesViewModel.cs
+++ b/Artemis/Artemis/ViewModels/GamesViewModel.cs
@@ -18,7 +18,7 @@ namespace Artemis.ViewModels
         {
             _rocketLeagueVm = new RocketLeagueViewModel(mainModel) {DisplayName = "Rocket League"};
             _counterStrikeVm = new CounterStrikeViewModel(mainModel) {DisplayName = "CS:GO"};
-            _dota2Vm = new Dota2ViewModel(mainModel) {DisplayName = "Dota 2 (NYI)"};
+            //_dota2Vm = new Dota2ViewModel(mainModel) {DisplayName = "Dota 2 (NYI)"};
             _witcher3Vm = new Witcher3ViewModel(mainModel) {DisplayName = "The Witcher 3"};
         }
 
@@ -28,7 +28,7 @@ namespace Artemis.ViewModels
 
             ActivateItem(_rocketLeagueVm);
             ActivateItem(_counterStrikeVm);
-            ActivateItem(_dota2Vm);
+            //ActivateItem(_dota2Vm);
             ActivateItem(_witcher3Vm);
         }
     }