diff --git a/src/apps/Highbyte.DotNet6502.App.SadConsole/ConfigUI/C64ConfigUIConsole.cs b/src/apps/Highbyte.DotNet6502.App.SadConsole/ConfigUI/C64ConfigUIConsole.cs
index ab99f3c1..7d9095bf 100644
--- a/src/apps/Highbyte.DotNet6502.App.SadConsole/ConfigUI/C64ConfigUIConsole.cs
+++ b/src/apps/Highbyte.DotNet6502.App.SadConsole/ConfigUI/C64ConfigUIConsole.cs
@@ -244,12 +244,6 @@ Label CreateLabel(string text, int col, int row, string? name = null)
             Controls.Add(labelTemp);
             return labelTemp;
         }
-        Label CreateLabelValue(string text, int col, int row, string? name = null)
-        {
-            var labelTemp = new Label(text) { Position = new Point(col, row), TextColor = Controls.GetThemeColors().Title, Name = name };
-            Controls.Add(labelTemp);
-            return labelTemp;
-        }
 
         // Force OnIsDirtyChanged event which will set control states (see SetControlStates)
         OnIsDirtyChanged();
@@ -272,7 +266,7 @@ private void ShowROMFilePickerDialog(string romName)
         {
             if (window.DialogResult)
             {
-                C64SystemConfig.SetROM(romName, Path.GetFileName(window.SelectedFile.FullName));
+                C64SystemConfig.SetROM(romName, Path.GetFileName(window.SelectedFile!.FullName));
                 IsDirty = true;
             }
         };
@@ -308,15 +302,15 @@ private void SetControlStates()
         romDirectoryTextBox!.IsDirty = true;
 
         var kernalROMTextBox = Controls["kernalROMTextBox"] as TextBox;
-        kernalROMTextBox!.Text = C64SystemConfig.ROMs.SingleOrDefault(x => x.Name == C64SystemConfig.KERNAL_ROM_NAME).File;
+        kernalROMTextBox!.Text = C64SystemConfig.ROMs.Single(x => x.Name == C64SystemConfig.KERNAL_ROM_NAME).File!;
         kernalROMTextBox!.IsDirty = true;
 
         var basicROMTextBox = Controls["basicROMTextBox"] as TextBox;
-        basicROMTextBox!.Text = C64SystemConfig.ROMs.SingleOrDefault(x => x.Name == C64SystemConfig.BASIC_ROM_NAME).File;
+        basicROMTextBox!.Text = C64SystemConfig.ROMs.Single(x => x.Name == C64SystemConfig.BASIC_ROM_NAME).File!;
         basicROMTextBox!.IsDirty = true;
 
         var chargenROMTextBox = Controls["chargenROMTextBox"] as TextBox;
-        chargenROMTextBox!.Text = C64SystemConfig.ROMs.SingleOrDefault(x => x.Name == C64SystemConfig.CHARGEN_ROM_NAME).File;
+        chargenROMTextBox!.Text = C64SystemConfig.ROMs.Single(x => x.Name == C64SystemConfig.CHARGEN_ROM_NAME).File!;
         chargenROMTextBox!.IsDirty = true;
 
         var codingAssistantTestButton = Controls["codingAssistantTestButton"] as Button;
diff --git a/src/apps/Highbyte.DotNet6502.App.SadConsole/ConfigUI/C64MenuConsole.cs b/src/apps/Highbyte.DotNet6502.App.SadConsole/ConfigUI/C64MenuConsole.cs
index be3a68ac..c275485d 100644
--- a/src/apps/Highbyte.DotNet6502.App.SadConsole/ConfigUI/C64MenuConsole.cs
+++ b/src/apps/Highbyte.DotNet6502.App.SadConsole/ConfigUI/C64MenuConsole.cs
@@ -76,7 +76,7 @@ private void DrawUIItems()
             Name = "c64CopyBasicSourceCodeButton",
             Position = (1, c64SaveBasicButton.Bounds.MaxExtentY + 2),
         };
-        c64CopyBasicSourceCodeButton.Click += C64CopyBasicSourceCodeButton_Click;
+        c64CopyBasicSourceCodeButton.Click += C64CopyBasicSourceCodeButton_Click!;
         Controls.Add(c64CopyBasicSourceCodeButton);
 
         // Paste
@@ -85,7 +85,7 @@ private void DrawUIItems()
             Name = "c64PasteTextButton",
             Position = (c64CopyBasicSourceCodeButton.Bounds.MaxExtentX + 9, c64CopyBasicSourceCodeButton.Position.Y),
         };
-        c64PasteTextButton.Click += C64PasteTextButton_Click;
+        c64PasteTextButton.Click += C64PasteTextButton_Click!;
         Controls.Add(c64PasteTextButton);
 
         // Paste
@@ -106,7 +106,7 @@ private void DrawUIItems()
             Name = "c64ConfigButton",
             Position = (1, c64aiBasicAssistantCheckbox.Bounds.MaxExtentY + 2),
         };
-        c64ConfigButton.Click += C64ConfigButton_Click;
+        c64ConfigButton.Click += C64ConfigButton_Click!;
         Controls.Add(c64ConfigButton);
 
 
@@ -114,12 +114,6 @@ private void DrawUIItems()
         validationMessageValueLabel.TextColor = Controls.GetThemeColors().Red;
 
         // Helper function to create a label and add it to the console
-        Label CreateLabel(string text, int col, int row, string? name = null)
-        {
-            var labelTemp = new Label(text) { Position = new Point(col, row), Name = name };
-            Controls.Add(labelTemp);
-            return labelTemp;
-        }
         Label CreateLabelValue(string text, int col, int row, string? name = null)
         {
             var labelTemp = new Label(text) { Position = new Point(col, row), TextColor = Controls.GetThemeColors().Title, Name = name };
@@ -148,9 +142,9 @@ private void C64LoadBasicButton_Click(object? sender, EventArgs e)
             {
                 try
                 {
-                    var fileName = window.SelectedFile.FullName;
+                    var fileName = window.SelectedFile!.FullName;
                     BinaryLoader.Load(
-                        _sadConsoleHostApp.CurrentRunningSystem.Mem,
+                        _sadConsoleHostApp.CurrentRunningSystem!.Mem,
                         fileName,
                         out ushort loadedAtAddress,
                         out ushort fileLength);
@@ -200,7 +194,7 @@ private void C64SaveBasicButton_Click(object? sender, EventArgs e)
                     var fileName = window.SelectedFile.FullName;
                     // TODO: Does FilePickerConsole check if file already exists and ask for overwrite? Or do this here?
                     ushort startAddressValue = C64.BASIC_LOAD_ADDRESS;
-                    var endAddressValue = ((C64)_sadConsoleHostApp.CurrentRunningSystem).GetBasicProgramEndAddress();
+                    var endAddressValue = ((C64)_sadConsoleHostApp.CurrentRunningSystem!).GetBasicProgramEndAddress();
                     BinarySaver.Save(
                         _sadConsoleHostApp.CurrentRunningSystem.Mem,
                         fileName,
@@ -300,10 +294,11 @@ private void SetControlStates()
         validationMessageValueLabel!.IsVisible = !isOk;
     }
 
-    public async Task ToggleBasicAIAssistant()
+    public Task ToggleBasicAIAssistant()
     {
         var c64aiBasicAssistantCheckbox = Controls["c64aiBasicAssistantCheckbox"] as CheckBox;
         c64aiBasicAssistantCheckbox.IsSelected = !c64aiBasicAssistantCheckbox.IsSelected;
+        return Task.CompletedTask;
     }
 
     private async Task SetBasicAIAssistant(bool enabled)
diff --git a/src/apps/Highbyte.DotNet6502.App.SadConsole/FilePickerConsole.cs b/src/apps/Highbyte.DotNet6502.App.SadConsole/FilePickerConsole.cs
index 642063ec..3c57089b 100644
--- a/src/apps/Highbyte.DotNet6502.App.SadConsole/FilePickerConsole.cs
+++ b/src/apps/Highbyte.DotNet6502.App.SadConsole/FilePickerConsole.cs
@@ -1,5 +1,4 @@
 using System.Diagnostics;
-using System.IO;
 using SadConsole.UI;
 using SadConsole.UI.Controls;
 
@@ -166,7 +165,7 @@ private void FileListBox_SelectedItemChanged(object? sender, ListBox.SelectedIte
                     _selectedDirectory = new DirectoryInfo(fileListBox.CurrentFolder);
                     if (_filePickerMode == FilePickerMode.OpenFile || _filePickerMode == FilePickerMode.SaveFile)
                     {
-                        if (_selectedFile != null && _selectedDirectory.FullName != _selectedFile.Directory.FullName)
+                        if (_selectedFile != null && _selectedDirectory.FullName != _selectedFile.Directory!.FullName)
                             _selectedFile = new FileInfo(Path.Combine(_selectedDirectory.FullName, _selectedFile.Name));
                     }
                     else
@@ -176,8 +175,8 @@ private void FileListBox_SelectedItemChanged(object? sender, ListBox.SelectedIte
                         //selectedItemTextBox.IsDirty = true;
                     }
                 }
-
             }
+
             if (e.Item is DirectoryInfo directoryInfo)
             {
                 //Debug.WriteLine($"DirectoryInfo: {directoryInfo.FullName}");
@@ -203,7 +202,7 @@ private void FileListBox_SelectedItemChanged(object? sender, ListBox.SelectedIte
                     return;
 
                 _selectedFile = fileInfo;
-                _selectedDirectory = fileInfo.Directory;
+                _selectedDirectory = fileInfo.Directory!;
 
                 selectedItemTextBox.Text = _selectedFile.Name;
                 selectedItemTextBox.IsDirty = true;
diff --git a/src/apps/Highbyte.DotNet6502.App.SadConsole/InfoConsole.cs b/src/apps/Highbyte.DotNet6502.App.SadConsole/InfoConsole.cs
index 8734d8e7..1112c177 100644
--- a/src/apps/Highbyte.DotNet6502.App.SadConsole/InfoConsole.cs
+++ b/src/apps/Highbyte.DotNet6502.App.SadConsole/InfoConsole.cs
@@ -137,7 +137,7 @@ Label CreateLabel(string text, int col, int row, string? name = null)
         // System debug info panel
         Panel debugInfoPanel = new Panel(10, 10);
         {
-            var labelTitleLength = 25;
+            var labelTitleLength = 28;
             _debugInfoLabels = new List<Label>();
             _debugInfoLabelValues = new List<Label>();
 
diff --git a/src/apps/Highbyte.DotNet6502.App.SadConsole/MonitorConsole.cs b/src/apps/Highbyte.DotNet6502.App.SadConsole/MonitorConsole.cs
index bb172d6b..44bb914f 100644
--- a/src/apps/Highbyte.DotNet6502.App.SadConsole/MonitorConsole.cs
+++ b/src/apps/Highbyte.DotNet6502.App.SadConsole/MonitorConsole.cs
@@ -1,6 +1,5 @@
 using Highbyte.DotNet6502.Monitor;
 using SadConsole.Components;
-using SadConsole.UI.Controls;
 using SadRogue.Primitives;
 using Console = SadConsole.Console;
 
@@ -19,9 +18,6 @@ internal class MonitorConsole : Console
     public SadConsoleMonitor Monitor => _monitor;
     private readonly ClassicConsoleKeyboardHandler _keyboardHandlerObject;
 
-    private Label _processorStatusLabel;
-    private List<Label> _sysInfoLabels;
-
     /// <summary>
     /// Console to display the monitor
     /// </summary>
diff --git a/src/apps/Highbyte.DotNet6502.App.SadConsole/MonitorStatusConsole.cs b/src/apps/Highbyte.DotNet6502.App.SadConsole/MonitorStatusConsole.cs
index 46d37271..74dd2657 100644
--- a/src/apps/Highbyte.DotNet6502.App.SadConsole/MonitorStatusConsole.cs
+++ b/src/apps/Highbyte.DotNet6502.App.SadConsole/MonitorStatusConsole.cs
@@ -1,4 +1,3 @@
-using Highbyte.DotNet6502.Systems;
 using Highbyte.DotNet6502.Utils;
 using SadConsole.UI;
 using SadRogue.Primitives;
@@ -13,10 +12,8 @@ internal class MonitorStatusConsole : ControlsConsole
 
     private readonly SadConsoleHostApp _sadConsoleHostApp;
 
-    public event EventHandler<bool>? MonitorStateChange;
-
     private const int NUMBER_OF_SYS_INFO_ROWS = USABLE_HEIGHT - 1;  // 1 row for CPU state
-    private string _emptyRow = new string(' ', USABLE_WIDTH);
+    private readonly string _emptyRow = new string(' ', USABLE_WIDTH);
 
 
     /// <summary>
diff --git a/src/apps/Highbyte.DotNet6502.App.SadConsole/SadConsoleHostApp.cs b/src/apps/Highbyte.DotNet6502.App.SadConsole/SadConsoleHostApp.cs
index 0c55157a..5d96f078 100644
--- a/src/apps/Highbyte.DotNet6502.App.SadConsole/SadConsoleHostApp.cs
+++ b/src/apps/Highbyte.DotNet6502.App.SadConsole/SadConsoleHostApp.cs
@@ -182,7 +182,7 @@ private IScreenObject CreateMainSadConsoleScreen(GameHost gameHost)
                 // Position monitor to the right of the emulator console
                 _monitorConsole.UsePixelPositioning = true;
                 // Note: _sadConsoleEmulatorConsole has already changed to UsePixelPositioning = true, so its Position.X is in pixels (not Width though).
-                var emulatorMaxX = _sadConsoleEmulatorConsole.Position.X + ((int)(_sadConsoleEmulatorConsole.Width * _sadConsoleEmulatorConsole.Font.GlyphWidth * CommonHostSystemConfig.DefaultFontSize.GetFontSizeScaleFactor()));
+                var emulatorMaxX = _sadConsoleEmulatorConsole!.Position.X + ((int)(_sadConsoleEmulatorConsole.Width * _sadConsoleEmulatorConsole.Font.GlyphWidth * CommonHostSystemConfig.DefaultFontSize.GetFontSizeScaleFactor()));
                 var infoConsoleMax = _infoConsole != null && _infoConsole.IsVisible ? _infoConsole.Position.X + _infoConsole.WidthPixels : 0;
                 _monitorConsole.Position = new Point(Math.Max(emulatorMaxX, infoConsoleMax), 0);
 
@@ -195,7 +195,7 @@ private IScreenObject CreateMainSadConsoleScreen(GameHost gameHost)
             }
             else
             {
-                _sadConsoleEmulatorConsole.IsFocused = true;
+                _sadConsoleEmulatorConsole!.IsFocused = true;
                 _sadConsoleEmulatorConsole.UseKeyboard = false;
             }
 
@@ -205,9 +205,9 @@ private IScreenObject CreateMainSadConsoleScreen(GameHost gameHost)
         _sadConsoleScreen.Children.Add(_monitorConsole);
 
         // Logo
-        int logoWidthAndHeight = 256; // Pixels
         _logoDrawImage = new DrawImage("Resources/Images/logo-256.png");
         _logoDrawImage.PositionMode = DrawImage.PositionModes.Pixels;
+        //int logoWidthAndHeight = 256; // Pixels
         //var logoX = (MenuConsole.CONSOLE_WIDTH * _menuConsole.Font.GlyphWidth) + ((StartupScreenWidth - MenuConsole.CONSOLE_WIDTH) * _menuConsole.Font.GlyphWidth - logoWidthAndHeight) / 2;
         //var logoY = ((MenuConsole.CONSOLE_HEIGHT * _menuConsole.Font.GlyphHeight) - logoWidthAndHeight) / 2;
         var logoX = (MenuConsole.CONSOLE_WIDTH * _menuConsole.Font.GlyphWidth) + 10;
@@ -236,7 +236,7 @@ public override void OnAfterSelectSystem()
         // Clear any old system specific menu console
         if (_systemMenuConsole != null)
         {
-            if (_sadConsoleScreen.Children.Contains(_systemMenuConsole))
+            if (_sadConsoleScreen!.Children.Contains(_systemMenuConsole))
                 _sadConsoleScreen.Children.Remove(_systemMenuConsole);
             _systemMenuConsole.Dispose();
             _systemMenuConsole = null;
@@ -246,7 +246,7 @@ public override void OnAfterSelectSystem()
         {
             _systemMenuConsole = new C64MenuConsole(this, _loggerFactory, _configuration);
             _systemMenuConsole.Position = (MENU_POSITION_X, _menuConsole.Height);
-            _sadConsoleScreen.Children.Add(_systemMenuConsole);
+            _sadConsoleScreen!.Children.Add(_systemMenuConsole);
         }
 
         _infoConsole.ShowSelectedSystemInfoHelp();
@@ -273,9 +273,9 @@ public override bool OnBeforeStart(ISystem systemAboutToBeStarted)
         }
         _sadConsoleEmulatorConsole = EmulatorConsole.Create(systemAboutToBeStarted, font, CommonHostSystemConfig.DefaultFontSize, SadConsoleUISettings.CreateEmulatorConsoleDrawBoxBorderParameters(font.SolidGlyphIndex));
         _sadConsoleEmulatorConsole.UsePixelPositioning = true;
-        _sadConsoleEmulatorConsole.Position = new Point((_menuConsole.Position.X * _menuConsole.Font.GlyphWidth) + (_menuConsole.Width * _menuConsole.Font.GlyphWidth), 0);
+        _sadConsoleEmulatorConsole.Position = new Point((_menuConsole!.Position.X * _menuConsole.Font.GlyphWidth) + (_menuConsole.Width * _menuConsole.Font.GlyphWidth), 0);
         _sadConsoleEmulatorConsole.IsFocused = true;
-        _sadConsoleScreen.Children.Add(_sadConsoleEmulatorConsole);
+        _sadConsoleScreen!.Children.Add(_sadConsoleEmulatorConsole);
 
         // Resize main window to fit menu, emulator, and other consoles
         Game.Instance.ResizeWindow(CalculateWindowWidthPixels(), CalculateWindowHeightPixels());
@@ -309,7 +309,7 @@ public override void OnAfterStart(EmulatorState emulatorStateBeforeStart)
     public override void OnBeforeStop()
     {
         // Disable monitor if it is visible
-        if (_monitorConsole.IsVisible)
+        if (_monitorConsole!.IsVisible)
             DisableMonitor();
         // Clear stats in info console if it is visible (logs will still be shown)
         if (_infoConsole.IsVisible)
@@ -320,7 +320,7 @@ public override void OnAfterStop()
         // Remove the console containing the running system
         if (_sadConsoleEmulatorConsole != null)
         {
-            if (_sadConsoleScreen.Children.Contains(_sadConsoleEmulatorConsole))
+            if (_sadConsoleScreen!.Children.Contains(_sadConsoleEmulatorConsole))
                 _sadConsoleScreen.Children.Remove(_sadConsoleEmulatorConsole);
             _sadConsoleEmulatorConsole.Dispose();
             _sadConsoleEmulatorConsole = null;
@@ -346,7 +346,7 @@ public override void OnAfterClose()
     private void UpdateSadConsole(object? sender, GameHost gameHost)
     {
         // Handle UI-specific keyboard inputs such as toggle monitor, info, etc.
-        HandleUIKeyboardInput();
+        HandleUIKeyboardInput().Wait();
 
         // RunEmulatorOneFrame() will first handle input, then emulator in run for one frame.
         RunEmulatorOneFrame();
@@ -586,10 +586,10 @@ public void SetEmulatorConsoleFocus()
     private async Task HandleUIKeyboardInput()
     {
         var keyboard = GameHost.Instance.Keyboard;
-        //if (keyboard.IsKeyPressed(Keys.F10))
+        //if (keyboard.IsKeyReleased(Keys.F10))
         //    ToggleLogs();
 
-        if (keyboard.IsKeyPressed(Keys.F11))
+        if (keyboard.IsKeyReleased(Keys.F11))
         {
             keyboard.Clear();
             ToggleInfo();
diff --git a/src/apps/Highbyte.DotNet6502.App.SadConsole/SystemSetup/C64HostConfig.cs b/src/apps/Highbyte.DotNet6502.App.SadConsole/SystemSetup/C64HostConfig.cs
index 39a86d8c..3428cc8f 100644
--- a/src/apps/Highbyte.DotNet6502.App.SadConsole/SystemSetup/C64HostConfig.cs
+++ b/src/apps/Highbyte.DotNet6502.App.SadConsole/SystemSetup/C64HostConfig.cs
@@ -8,7 +8,7 @@ public class C64HostConfig : SadConsoleHostSystemConfigBase
 {
     public const string ConfigSectionName = "Highbyte.DotNet6502.C64.SadConsole";
 
-    public C64SystemConfig SystemConfig
+    public new C64SystemConfig SystemConfig
     {
         get { return (C64SystemConfig)base.SystemConfig; }
         set { base.SystemConfig = value; }
diff --git a/src/apps/Highbyte.DotNet6502.App.SadConsole/SystemSetup/C64Setup.cs b/src/apps/Highbyte.DotNet6502.App.SadConsole/SystemSetup/C64Setup.cs
index 0d0a5d8c..786ba2a8 100644
--- a/src/apps/Highbyte.DotNet6502.App.SadConsole/SystemSetup/C64Setup.cs
+++ b/src/apps/Highbyte.DotNet6502.App.SadConsole/SystemSetup/C64Setup.cs
@@ -63,6 +63,8 @@ public Task<ISystem> BuildSystem(string configurationVariant, IHostSystemConfig
             C64Model = configurationVariant,
             Vic2Model = C64ModelInventory.C64Models[configurationVariant].Vic2Models.First().Name, // NTSC, NTSC_old, PAL
             AudioEnabled = c64HostSystemConfig.SystemConfig.AudioEnabled,
+            KeyboardJoystickEnabled = c64HostSystemConfig.SystemConfig.KeyboardJoystickEnabled,
+            KeyboardJoystick = c64HostSystemConfig.SystemConfig.KeyboardJoystick,
             ROMs = c64HostSystemConfig.SystemConfig.ROMs,
             ROMDirectory = c64HostSystemConfig.SystemConfig.ROMDirectory,
         };
diff --git a/src/apps/Highbyte.DotNet6502.App.SadConsole/SystemSetup/GenericComputerHostConfig.cs b/src/apps/Highbyte.DotNet6502.App.SadConsole/SystemSetup/GenericComputerHostConfig.cs
index 6d348657..8cf8c0b6 100644
--- a/src/apps/Highbyte.DotNet6502.App.SadConsole/SystemSetup/GenericComputerHostConfig.cs
+++ b/src/apps/Highbyte.DotNet6502.App.SadConsole/SystemSetup/GenericComputerHostConfig.cs
@@ -7,7 +7,7 @@ public class GenericComputerHostConfig : SadConsoleHostSystemConfigBase
 {
     public const string ConfigSectionName = "Highbyte.DotNet6502.GenericComputer.SadConsole";
 
-    public GenericComputerSystemConfig SystemConfig
+    public new GenericComputerSystemConfig SystemConfig
     {
         get { return (GenericComputerSystemConfig)base.SystemConfig; }
         set { base.SystemConfig = value; }
diff --git a/src/apps/Highbyte.DotNet6502.App.SilkNetNative/SilkNetHostApp.cs b/src/apps/Highbyte.DotNet6502.App.SilkNetNative/SilkNetHostApp.cs
index 0a658310..e8f46c53 100644
--- a/src/apps/Highbyte.DotNet6502.App.SilkNetNative/SilkNetHostApp.cs
+++ b/src/apps/Highbyte.DotNet6502.App.SilkNetNative/SilkNetHostApp.cs
@@ -452,7 +452,7 @@ private SilkNetImGuiStatsPanel CreateStatsUI()
 
     private SilkNetImGuiDebugPanel CreateDebugUI()
     {
-        return new SilkNetImGuiDebugPanel(GetDebugInfo);
+        return new SilkNetImGuiDebugPanel(() => CurrentRunningSystem!.DebugInfo);
     }
 
     private SilkNetImGuiLogsPanel CreateLogsUI(DotNet6502InMemLogStore logStore, DotNet6502InMemLoggerConfiguration logConfig)
diff --git a/src/apps/Highbyte.DotNet6502.App.SilkNetNative/SystemSetup/C64Setup.cs b/src/apps/Highbyte.DotNet6502.App.SilkNetNative/SystemSetup/C64Setup.cs
index fac8d16b..856f22fc 100644
--- a/src/apps/Highbyte.DotNet6502.App.SilkNetNative/SystemSetup/C64Setup.cs
+++ b/src/apps/Highbyte.DotNet6502.App.SilkNetNative/SystemSetup/C64Setup.cs
@@ -50,6 +50,8 @@ public Task<ISystem> BuildSystem(string configurationVariant, IHostSystemConfig
             C64Model = configurationVariant,
             Vic2Model = C64ModelInventory.C64Models[configurationVariant].Vic2Models.First().Name, // NTSC, NTSC_old, PAL
             AudioEnabled = c64HostSystemConfig.SystemConfig.AudioEnabled,
+            KeyboardJoystickEnabled = c64HostSystemConfig.SystemConfig.KeyboardJoystickEnabled,
+            KeyboardJoystick = c64HostSystemConfig.SystemConfig.KeyboardJoystick,
             ROMs = c64HostSystemConfig.SystemConfig.ROMs,
             ROMDirectory = c64HostSystemConfig.SystemConfig.ROMDirectory,
         };
diff --git a/src/apps/Highbyte.DotNet6502.App.WASM/Emulator/SystemSetup/C64Setup.cs b/src/apps/Highbyte.DotNet6502.App.WASM/Emulator/SystemSetup/C64Setup.cs
index d929c0b7..5ac6e1a6 100644
--- a/src/apps/Highbyte.DotNet6502.App.WASM/Emulator/SystemSetup/C64Setup.cs
+++ b/src/apps/Highbyte.DotNet6502.App.WASM/Emulator/SystemSetup/C64Setup.cs
@@ -97,6 +97,8 @@ public Task<ISystem> BuildSystem(string configurationVariant, IHostSystemConfig
             C64Model = configurationVariant,
             Vic2Model = C64ModelInventory.C64Models[configurationVariant].Vic2Models.First().Name, // NTSC, NTSC_old, PAL
             AudioEnabled = c64HostSystemConfig.SystemConfig.AudioEnabled,
+            KeyboardJoystickEnabled = c64HostSystemConfig.SystemConfig.KeyboardJoystickEnabled,
+            KeyboardJoystick = c64HostSystemConfig.SystemConfig.KeyboardJoystick,
             ROMs = c64HostSystemConfig.SystemConfig.ROMs,
             ROMDirectory = c64HostSystemConfig.SystemConfig.ROMDirectory,
         };
@@ -206,7 +208,7 @@ public static async Task<ICodeSuggestion> GetCodeSuggestionImplementation(C64Hos
             if (c64HostConfig.CodeSuggestionBackendType == CodeSuggestionBackendTypeEnum.OpenAI)
             {
                 var openAIApiConfig = await GetOpenAIConfig(localStorageService);
-                codeSuggestion = OpenAICodeSuggestion.CreateOpenAICodeSuggestionForOpenAI(openAIApiConfig, C64BasicCodingAssistant.CODE_COMPLETION_LANGUAGE_DESCRIPTION, C64BasicCodingAssistant.CODE_COMPLETION_ADDITIONAL_SYSTEM_INSTRUCTION);
+                codeSuggestion = OpenAICodeSuggestion.CreateOpenAICodeSuggestion(openAIApiConfig, C64BasicCodingAssistant.CODE_COMPLETION_LANGUAGE_DESCRIPTION, C64BasicCodingAssistant.CODE_COMPLETION_ADDITIONAL_SYSTEM_INSTRUCTION);
             }
             else if (c64HostConfig.CodeSuggestionBackendType == CodeSuggestionBackendTypeEnum.OpenAISelfHostedCodeLlama)
             {
diff --git a/src/apps/Highbyte.DotNet6502.App.WASM/Pages/Commodore64/C64ConfigUI.razor b/src/apps/Highbyte.DotNet6502.App.WASM/Pages/Commodore64/C64ConfigUI.razor
index 17c49042..99337a8b 100644
--- a/src/apps/Highbyte.DotNet6502.App.WASM/Pages/Commodore64/C64ConfigUI.razor
+++ b/src/apps/Highbyte.DotNet6502.App.WASM/Pages/Commodore64/C64ConfigUI.razor
@@ -175,7 +175,7 @@
 </details>
 
 <details id="basic_ai_section">
-    <summary>Basic AI coding assistant</summary>
+    <summary>Basic AI coding assistant <a href="https://github.com/highbyte/dotnet-6502/blob/master/doc/SYSTEMS_C64_COMPATIBLE_PRG.md" target="_blank">(info)</a></summary>
 
     <div class="row">
         <div class="column">
@@ -433,7 +433,7 @@
         ICodeSuggestion codeSuggestion;
         if(C64HostConfig.CodeSuggestionBackendType == CodeSuggestionBackendTypeEnum.OpenAI)
         {
-            codeSuggestion = OpenAICodeSuggestion.CreateOpenAICodeSuggestionForOpenAI(_openAIApiConfig, C64BasicCodingAssistant.CODE_COMPLETION_LANGUAGE_DESCRIPTION, C64BasicCodingAssistant.CODE_COMPLETION_ADDITIONAL_SYSTEM_INSTRUCTION);
+            codeSuggestion = OpenAICodeSuggestion.CreateOpenAICodeSuggestion(_openAIApiConfig, C64BasicCodingAssistant.CODE_COMPLETION_LANGUAGE_DESCRIPTION, C64BasicCodingAssistant.CODE_COMPLETION_ADDITIONAL_SYSTEM_INSTRUCTION);
         }
         else if(C64HostConfig.CodeSuggestionBackendType == CodeSuggestionBackendTypeEnum.OpenAISelfHostedCodeLlama)
         {
diff --git a/src/apps/Highbyte.DotNet6502.App.WASM/Pages/Commodore64/C64Menu.razor b/src/apps/Highbyte.DotNet6502.App.WASM/Pages/Commodore64/C64Menu.razor
index fdea14e2..5c6d390d 100644
--- a/src/apps/Highbyte.DotNet6502.App.WASM/Pages/Commodore64/C64Menu.razor
+++ b/src/apps/Highbyte.DotNet6502.App.WASM/Pages/Commodore64/C64Menu.razor
@@ -149,15 +149,7 @@
     {
         var joystick = int.Parse(e.Value!.ToString()!);
         _c64HostConfig.InputConfig.CurrentJoystick = joystick;
-
         Parent.WasmHost.UpdateHostSystemConfig(_c64HostConfig);
-
-        // If system is running, also make sure to update the joystick setting in the running system
-        if (Parent.CurrentEmulatorState != EmulatorState.Uninitialized)
-        {
-            C64 c64 = (C64)Parent.WasmHost.CurrentRunningSystem!;
-            c64.Cia.Joystick.KeyboardJoystick = joystick;
-        }
     }
 
     private bool JoystickKeyboardEnabled
@@ -169,6 +161,7 @@
         set
         {
             _c64SystemConfig.KeyboardJoystickEnabled = value;
+            Parent.WasmHost.UpdateHostSystemConfig(_c64HostConfig);
 
             // If system is running, also make sure to update the joystick setting in the running system
             if (Parent.CurrentEmulatorState != EmulatorState.Uninitialized)
@@ -179,9 +172,10 @@
         }
     }
 
-    private void OnSelectKeyboardJoystickChanged(ChangeEventArgs e)
+    private Task OnSelectKeyboardJoystickChanged(ChangeEventArgs e)
     {
         KeyboardJoystick = int.Parse(e.Value!.ToString()!);
+        return Task.CompletedTask;
     }
 
     private int KeyboardJoystick
@@ -193,6 +187,7 @@
         set
         {
             _c64SystemConfig.KeyboardJoystick = value;
+            Parent.WasmHost.UpdateHostSystemConfig(_c64HostConfig);
 
             // If system is running, also make sure to update the joystick setting in the running system
             if (Parent.CurrentEmulatorState != EmulatorState.Uninitialized)
diff --git a/src/libraries/Highbyte.DotNet6502.AI/CodingAssistant/CodeSuggestionConfigurator.cs b/src/libraries/Highbyte.DotNet6502.AI/CodingAssistant/CodeSuggestionConfigurator.cs
index 01cdeef3..2bcf5c06 100644
--- a/src/libraries/Highbyte.DotNet6502.AI/CodingAssistant/CodeSuggestionConfigurator.cs
+++ b/src/libraries/Highbyte.DotNet6502.AI/CodingAssistant/CodeSuggestionConfigurator.cs
@@ -16,7 +16,7 @@ public static ICodeSuggestion CreateCodeSuggestion(
         {
             codeSuggestion = codeSuggestionBackendType switch
             {
-                CodeSuggestionBackendTypeEnum.OpenAI => OpenAICodeSuggestion.CreateOpenAICodeSuggestionForOpenAI(configuration, programmingLanguage, additionalSystemInstruction),
+                CodeSuggestionBackendTypeEnum.OpenAI => OpenAICodeSuggestion.CreateOpenAICodeSuggestion(configuration, programmingLanguage, additionalSystemInstruction),
                 CodeSuggestionBackendTypeEnum.OpenAISelfHostedCodeLlama => OpenAICodeSuggestion.CreateOpenAICodeSuggestionForCodeLlama(configuration, programmingLanguage, additionalSystemInstruction),
                 CodeSuggestionBackendTypeEnum.CustomEndpoint => new CustomAIEndpointCodeSuggestion(configuration, programmingLanguage),
                 CodeSuggestionBackendTypeEnum.None => new NoCodeSuggestion(),
diff --git a/src/libraries/Highbyte.DotNet6502.AI/CodingAssistant/OpenAICodeSuggestion.cs b/src/libraries/Highbyte.DotNet6502.AI/CodingAssistant/OpenAICodeSuggestion.cs
index bbdeee51..9c835842 100644
--- a/src/libraries/Highbyte.DotNet6502.AI/CodingAssistant/OpenAICodeSuggestion.cs
+++ b/src/libraries/Highbyte.DotNet6502.AI/CodingAssistant/OpenAICodeSuggestion.cs
@@ -12,9 +12,9 @@ public class OpenAICodeSuggestion : ICodeSuggestion
     private readonly CodeCompletionInference _codeCompletionInference;
 
     // OpenAI
-    public static OpenAICodeSuggestion CreateOpenAICodeSuggestionForOpenAI(IConfiguration configuration, string programmingLanguage, string additionalSystemInstruction = "")
-    => CreateOpenAICodeSuggestionForOpenAI(new ApiConfig(configuration, selfHosted: false), programmingLanguage, additionalSystemInstruction);
-    public static OpenAICodeSuggestion CreateOpenAICodeSuggestionForOpenAI(ApiConfig apiConfig, string programmingLanguage, string additionalSystemInstruction)
+    public static OpenAICodeSuggestion CreateOpenAICodeSuggestion(IConfiguration configuration, string programmingLanguage, string additionalSystemInstruction = "")
+    => CreateOpenAICodeSuggestion(new ApiConfig(configuration, selfHosted: false), programmingLanguage, additionalSystemInstruction);
+    public static OpenAICodeSuggestion CreateOpenAICodeSuggestion(ApiConfig apiConfig, string programmingLanguage, string additionalSystemInstruction)
     {
         var codeCompletionConfig = CodeSuggestionSystemInstructions.GetOpenAICodeCompletionConfig(programmingLanguage, additionalSystemInstruction);
         return new OpenAICodeSuggestion(apiConfig, codeCompletionConfig);
diff --git a/src/libraries/Highbyte.DotNet6502.Systems.Commodore64/C64.cs b/src/libraries/Highbyte.DotNet6502.Systems.Commodore64/C64.cs
index 7dc9acf8..6c6cd7f2 100644
--- a/src/libraries/Highbyte.DotNet6502.Systems.Commodore64/C64.cs
+++ b/src/libraries/Highbyte.DotNet6502.Systems.Commodore64/C64.cs
@@ -57,8 +57,8 @@ public class C64 : ISystem, ISystemMonitor
 
     public bool RememberVic2RegistersPerRasterLine { get; set; } = true;
 
-    public C64BasicTokenParser BasicTokenParser { get; private set; }
-    public C64TextPaste TextPaste { get; private set; }
+    public C64BasicTokenParser BasicTokenParser { get; private set; } = default!;
+    public C64TextPaste TextPaste { get; private set; } = default!;
 
     //public static ROM[] ROMS = new ROM[]
     //{   
@@ -476,6 +476,14 @@ private List<string> BuildSystemInfo()
     private List<KeyValuePair<string, Func<string>>> BuildDebugInfo()
     {
         List<KeyValuePair<string, Func<string>>> debugInfoList = [
+            new ("Keyboard joystick enabled", () =>
+            {
+                return Cia.Joystick.KeyboardJoystickEnabled.ToString();
+            }),
+            new ("Keyboard joystick #", () =>
+            {
+                return Cia.Joystick.KeyboardJoystick.ToString();
+            }),
             new ("Current Basic line #", () =>
             {
                 // Address 0x39: Current BASIC line number.
@@ -565,5 +573,4 @@ public void SetPostInstructionAudioCallback(Action<InstructionExecResult> callba
     {
         _postInstructionAudioCallback = callback;
     }
-
 }
diff --git a/src/libraries/Highbyte.DotNet6502.Systems.Commodore64/Config/C64Config.cs b/src/libraries/Highbyte.DotNet6502.Systems.Commodore64/Config/C64Config.cs
index 1d40f587..d9af797a 100644
--- a/src/libraries/Highbyte.DotNet6502.Systems.Commodore64/Config/C64Config.cs
+++ b/src/libraries/Highbyte.DotNet6502.Systems.Commodore64/Config/C64Config.cs
@@ -28,6 +28,7 @@ public class C64Config
     public C64Config()
     {
         // Defaults
+        ROMDirectory = "";
         LoadROMs = true;     // Set false for unit tests
         ROMs = new List<ROM>();
 
diff --git a/src/libraries/Highbyte.DotNet6502.Systems.Commodore64/Video/Vic2SpriteManager.cs b/src/libraries/Highbyte.DotNet6502.Systems.Commodore64/Video/Vic2SpriteManager.cs
index 79d37bc1..cd647de5 100644
--- a/src/libraries/Highbyte.DotNet6502.Systems.Commodore64/Video/Vic2SpriteManager.cs
+++ b/src/libraries/Highbyte.DotNet6502.Systems.Commodore64/Video/Vic2SpriteManager.cs
@@ -1,5 +1,3 @@
-using System.Buffers;
-using System.Security.Cryptography;
 using Highbyte.DotNet6502.Systems.Utils;
 using Highbyte.DotNet6502.Utils;
 using static Highbyte.DotNet6502.Systems.Commodore64.Video.Vic2;
@@ -18,9 +16,9 @@ public class Vic2SpriteManager : IVic2SpriteManager
 
     public int SpritePointerStartAddress => Vic2.VideoMatrixBaseAddress + 0x03f8; // Default value is 0x07f8 (because Vic2.VideoMatrixBaseAddress is 0x0400 by default). 8 sprites, last is 0x07ff.
 
-    const int NUMBERS_OF_SPRITES = 8;
-    const int SCREEN_OFFSET_X = 24;
-    const int SCREEN_OFFSET_Y = 50;
+    private const int NUMBERS_OF_SPRITES = 8;
+    private const int SCREEN_OFFSET_X = 24;
+    private const int SCREEN_OFFSET_Y = 50;
     public int NumberOfSprites => NUMBERS_OF_SPRITES;
     //The Sprite top/left X position that appears on main screen (not border) position 0.
     public int ScreenOffsetX => SCREEN_OFFSET_X;
@@ -34,7 +32,6 @@ public class Vic2SpriteManager : IVic2SpriteManager
     public byte SpriteToBackgroundCollisionStore { get; set; }
     public bool SpriteToBackgroundCollisionIRQBlock { get; set; }
 
-
     // Pre-calculate all possible sprite combination for collision detection
     // Get all K-Combinations of sprite numbers (2)
     // This will give us all possible combinations of sprite pairs
@@ -125,11 +122,15 @@ public byte GetSpriteToSpriteCollision()
             for (int screenLine = 0; screenLine < sprite.HeightPixels; screenLine++)
             {
                 // Get the pixels in the sprite line (24 pixels/3 bytes, or 48 pixels/ 6 bytes, depending if sprite is expanded horizontally or not)
+#pragma warning disable CA2014 // Do not use stackalloc in loops (24 or 48 times = height of sprite, should be fine)
                 Span<byte> spriteLineData = stackalloc byte[sprite.WidthBytes];
+#pragma warning restore CA2014 // Do not use stackalloc in loops
                 GetSpriteRowLineData(sprite, screenLine, ref spriteLineData);
 
                 // Get the corresponding character row line data (adjusted to align with byte boundaries for easy comparison)
+#pragma warning disable CA2014 // Do not use stackalloc in loops (24 or 48 times = height of sprite, should be fine)
                 Span<byte> otherSpriteLineData = stackalloc byte[spriteLineData.Length];
+#pragma warning restore CA2014 // Do not use stackalloc in loops
                 GetSpriteRowLineDataMatchingOtherSpritePosition(sprite, otherSprite, screenLine, ref otherSpriteLineData);
 
                 // Check collision on line
@@ -177,13 +178,17 @@ public bool CheckCollisionAgainstBackground(Vic2Sprite sprite, int scrollX, int
         for (int screenLine = 0; screenLine < sprite.HeightPixels; screenLine++)
         {
             // Get the pixels in the sprite line (24 pixels/3 bytes, or 48 pixels/ 6 bytes, depending if sprite is expanded vertically or not)
+#pragma warning disable CA2014 // Do not use stackalloc in loops (24 or 48 times = height of sprite, should be fine)
             Span<byte> spriteLineData = stackalloc byte[sprite.WidthBytes];
+#pragma warning restore CA2014 // Do not use stackalloc in loops
 
             GetSpriteRowLineData(sprite, screenLine, ref spriteLineData);
 
             // Get the corresponding character row line data (adjusted to align with byte boundaries for easy comparison)
             //byte[] screenLineData = GetCharacterRowLineDataMatchingSpritePosition(sprite, screenLine, spriteLineData.Length, scrollX, scrollY);
+#pragma warning disable CA2014 // Do not use stackalloc in loops (24 or 48 times = height of sprite, should be fine)
             Span<byte> screenLineData = stackalloc byte[sprite.WidthBytes + 1];
+#pragma warning restore CA2014 // Do not use stackalloc in loops
             GetCharacterRowLineDataMatchingSpritePosition(sprite, screenLine, spriteLineData.Length, scrollX, scrollY, ref screenLineData);
 
             // Check collision on line
@@ -245,7 +250,9 @@ private void AdjustSpriteLineDataForCollisionDetection(Vic2Sprite sprite, byte[]
             // If double with sprite, then expand each byte to two bytes (each pixel is 2 bits instead of 1)
             if (sprite.DoubleWidth)
             {
+#pragma warning disable CA2014 // Do not use stackalloc in loops (max 3 times, should be fine)
                 Span<byte> expandedPair = stackalloc byte[2];
+#pragma warning restore CA2014 // Do not use stackalloc in loops
                 originalSpriteLineData[i].StretchBits(ref expandedPair);
                 spriteLineData[i * 2] = expandedPair[0];
                 spriteLineData[i * 2 + 1] = expandedPair[1];
@@ -308,7 +315,6 @@ private byte GetSpritePixelByteForCoordinate(Vic2Sprite sprite, int x, int y)
         return result;
     }
 
-
     /// <summary>
     /// 
     /// </summary>
@@ -392,7 +398,6 @@ public void GetCharacterRowLineDataMatchingSpritePosition(Vic2Sprite sprite, int
         Span<byte> shiftedBytes = stackalloc byte[bytes.Length];
         bytes.ShiftRight(ref shiftedBytes, scrollPixelsRight, out _);
 
-
         // All but first byte
         shiftedBytes.CopyTo(bytes);
         bytes = bytes.Slice(1, spriteBytesWidth);
diff --git a/src/libraries/Highbyte.DotNet6502.Systems/HostApp.cs b/src/libraries/Highbyte.DotNet6502.Systems/HostApp.cs
index e86f2910..ec6562ea 100644
--- a/src/libraries/Highbyte.DotNet6502.Systems/HostApp.cs
+++ b/src/libraries/Highbyte.DotNet6502.Systems/HostApp.cs
@@ -29,19 +29,16 @@ public class HostApp<TRenderContext, TInputHandlerContext, TAudioHandlerContext>
     public string SelectedSystemName => _selectedSystemName;
     public HashSet<string> AvailableSystemNames => _systemList.Systems;
 
-
     private string _selectedSystemConfigurationVariant;
     public string SelectedSystemConfigurationVariant => _selectedSystemConfigurationVariant;
     private List<string> _allSelectedSystemConfigurationVariants = new();
     public List<string> AllSelectedSystemConfigurationVariants => _allSelectedSystemConfigurationVariants;
 
-
     private SystemRunner? _systemRunner = null;
     public SystemRunner? CurrentSystemRunner => _systemRunner;
     public ISystem? CurrentRunningSystem => _systemRunner?.System;
     public EmulatorState EmulatorState { get; private set; } = EmulatorState.Uninitialized;
 
-
     private IHostSystemConfig? _currentHostSystemConfig;
 
     /// <summary>
@@ -82,12 +79,10 @@ protected List<IHostSystemConfig> GetHostSystemConfigs()
     private ElapsedMillisecondsTimedStatSystem? _inputTime;
     //private ElapsedMillisecondsTimedStatSystem _audioTime;
 
-
     private readonly Instrumentations _instrumentations = new();
     private readonly PerSecondTimedStat _updateFps;
     private readonly PerSecondTimedStat _renderFps;
 
-
     public HostApp(
         string hostName,
         SystemList<TRenderContext, TInputHandlerContext, TAudioHandlerContext> systemList,
@@ -104,7 +99,6 @@ ILoggerFactory loggerFactory
             throw new DotNet6502Exception("No systems added to system list.");
         _systemList = systemList;
 
-
         //Note: Because selecting a system (incl which variants it has) requires async call,
         //      call SelectSystem(string systemName) after HostApp is created to set the initial system.
         _selectedSystemName = "DEFAULT SYSTEM";
@@ -160,12 +154,11 @@ public async Task SelectSystemConfigurationVariant(string configurationVariant)
 
         _selectedSystemConfigurationVariant = configurationVariant;
 
-        return ;
+        return;
     }
 
     public virtual void OnAfterSelectSystem() { }
 
-
     public virtual bool OnBeforeStart(ISystem systemAboutToBeStarted)
     {
         return true;
@@ -262,7 +255,6 @@ public void Close()
     }
     public virtual void OnAfterClose() { }
 
-
     public virtual void OnBeforeRunEmulatorOneFrame(out bool shouldRun, out bool shouldReceiveInput)
     {
         shouldRun = true;
@@ -382,11 +374,4 @@ private void InitInstrumentation(ISystem system)
             .Union(_systemRunner.InputHandler.Instrumentations.Stats.Select(x => (Name: $"{_hostName}-{InputTimeStatName}-{x.Name}", x.Stat)))
             .ToList();
     }
-
-    public List<KeyValuePair<string, Func<string>>> GetDebugInfo()
-    {
-        if (_systemRunner == null)
-            return null;
-        return _systemRunner.System.DebugInfo;
-    }
 }