diff --git a/src/MeloNX/MeloNX.xcodeproj/project.xcworkspace/xcuserdata/stossy11.xcuserdatad/UserInterfaceState.xcuserstate b/src/MeloNX/MeloNX.xcodeproj/project.xcworkspace/xcuserdata/stossy11.xcuserdatad/UserInterfaceState.xcuserstate
index c39223b5a..988b496b7 100644
Binary files a/src/MeloNX/MeloNX.xcodeproj/project.xcworkspace/xcuserdata/stossy11.xcuserdatad/UserInterfaceState.xcuserstate and b/src/MeloNX/MeloNX.xcodeproj/project.xcworkspace/xcuserdata/stossy11.xcuserdatad/UserInterfaceState.xcuserstate differ
diff --git a/src/MeloNX/MeloNX/App/Views/Main/Emulation/EmulationView/InGameSettingsManager/InGameSettingsManager.swift b/src/MeloNX/MeloNX/App/Views/Main/Emulation/EmulationView/InGameSettingsManager/InGameSettingsManager.swift
index 10958d1e8..acbb15195 100644
--- a/src/MeloNX/MeloNX/App/Views/Main/Emulation/EmulationView/InGameSettingsManager/InGameSettingsManager.swift
+++ b/src/MeloNX/MeloNX/App/Views/Main/Emulation/EmulationView/InGameSettingsManager/InGameSettingsManager.swift
@@ -35,7 +35,6 @@ class InGameSettingsManager: PerGameSettingsManaging {
             Ryujinx.shared.config = config[currentgame.titleId]
             let args = Ryujinx.shared.buildCommandLineArgs(from: config[currentgame.titleId] ?? Ryujinx.Arguments())
             
-            // Convert Arguments to ones that Ryujinx can Read
             let cArgs = args.map { strdup($0) }
             defer { cArgs.forEach { free($0) } }
             var argvPtrs = cArgs
diff --git a/src/MeloNX/MeloNX/App/Views/Main/UI/ContentView.swift b/src/MeloNX/MeloNX/App/Views/Main/UI/ContentView.swift
index 0c5e6f02e..1eb05187d 100644
--- a/src/MeloNX/MeloNX/App/Views/Main/UI/ContentView.swift
+++ b/src/MeloNX/MeloNX/App/Views/Main/UI/ContentView.swift
@@ -81,8 +81,6 @@ struct ContentView: View {
         
         _settings = State(initialValue: defaultSettings)
         
-        // print(SDL_CONTROLLER_BUTTON_LEFTSTICK.rawValue)
-        
         initializeSDL()
     }
     
@@ -132,7 +130,6 @@ struct ContentView: View {
                 JITPopover() {
                     ryujinx.jitenabled = false
                 }
-                // .interactiveDismissDisabled()
             }
     }
     
@@ -153,11 +150,8 @@ struct ContentView: View {
                 refreshControllersList()
             }
             
-            
             UserDefaults.standard.set(false, forKey: "lockInApp")
             
-            // print(MTLHud.shared.isEnabled)
-            
             initControllerObservers()
             
             Air.play(AnyView(
@@ -166,7 +160,6 @@ struct ContentView: View {
             
             refreshControllersList()
             
-            
             ryujinx.addGames()
             
             checkJitStatus()
@@ -287,7 +280,6 @@ struct ContentView: View {
             queue: .main
         ) { notification in
             if let controller = notification.object as? GCController {
-                // print("Controller connected: \(controller.productCategory)")
                 nativeControllers[controller] = .init(controller)
                 refreshControllersList()
             }
@@ -299,7 +291,8 @@ struct ContentView: View {
             queue: .main
         ) { notification in
             if let controller = notification.object as? GCController {
-                // print("Controller disconnected: \(controller.productCategory)")
+                currentControllers = []
+                controllersList = []
                 nativeControllers[controller]?.cleanup()
                 nativeControllers[controller] = nil
                 refreshControllersList()
@@ -316,6 +309,9 @@ struct ContentView: View {
     }
     
     private func refreshControllersList() {
+        currentControllers = []
+        controllersList = []
+        
         controllersList = ryujinx.getConnectedControllers()
         
         if let onscreen = controllersList.first(where: { $0.name == ryujinx.virtualController.controllername }) {
@@ -324,8 +320,6 @@ struct ContentView: View {
         
         controllersList.removeAll(where: { $0.id == "0" || (!$0.name.starts(with: "GC - ") && $0 != onscreencontroller) })
         controllersList.mutableForEach { $0.name = $0.name.replacingOccurrences(of: "GC - ", with: "") }
-
-        currentControllers = []
         
         if controllersList.count == 1 {
             currentControllers.append(controllersList[0])
diff --git a/src/Ryujinx.Graphics.Vulkan/Constants.cs b/src/Ryujinx.Graphics.Vulkan/Constants.cs
index 2267172e3..8103e2de8 100644
--- a/src/Ryujinx.Graphics.Vulkan/Constants.cs
+++ b/src/Ryujinx.Graphics.Vulkan/Constants.cs
@@ -10,7 +10,7 @@ namespace Ryujinx.Graphics.Vulkan
         public const int MaxShaderStages = 5;
         public const int MaxUniformBuffersPerStage = 18;
         public const int MaxStorageBuffersPerStage = 16;
-        public const int MaxTexturesPerStage = 18;
+        public const int MaxTexturesPerStage = 31;
         public const int MaxImagesPerStage = 16;
         public const int MaxUniformBufferBindings = MaxUniformBuffersPerStage * MaxShaderStages;
         public const int MaxStorageBufferBindings = MaxStorageBuffersPerStage * MaxShaderStages;
diff --git a/src/Ryujinx.Graphics.Vulkan/VulkanRenderer.cs b/src/Ryujinx.Graphics.Vulkan/VulkanRenderer.cs
index bb4792dbe..231d61718 100644
--- a/src/Ryujinx.Graphics.Vulkan/VulkanRenderer.cs
+++ b/src/Ryujinx.Graphics.Vulkan/VulkanRenderer.cs
@@ -649,8 +649,7 @@ namespace Ryujinx.Graphics.Vulkan
 
             if (!OperatingSystem.IsIOSVersionAtLeast(16, 4))
             {
-                // On iOS 16.4 and later, these formats are supported.
-                // On earlier versions, it is not supported.
+                // On iOS 16.3.1 and earlier, these formats are not supported.
                 supportsBc123CompressionFormat = false;
                 supportsBc45CompressionFormat = false;
                 supportsBc67CompressionFormat = false;