diff --git a/Android/app/src/main/java/com/dishii/mm/MainActivity.java b/Android/app/src/main/java/com/dishii/mm/MainActivity.java
index aff7a7b41..702d8b84b 100644
--- a/Android/app/src/main/java/com/dishii/mm/MainActivity.java
+++ b/Android/app/src/main/java/com/dishii/mm/MainActivity.java
@@ -200,6 +200,7 @@ public class MainActivity extends SDLActivity{
 
 
     public native void attachController();
+    public native void detachController();
     // Native method for setting button state
     public native void setButton(int button, boolean value);
     public native void setCameraState(int axis, float value);
@@ -290,14 +291,19 @@ public class MainActivity extends SDLActivity{
     private void setupToggleButton(Button button, ViewGroup uiGroup){
         boolean isHidden = preferences.getBoolean("controlsVisible", false); // Default to 'false' (visible)
         uiGroup.setVisibility(isHidden ? View.INVISIBLE : View.VISIBLE); // Set the initial visibility based on the saved state
+        /*if(isHidden){
+            detachController();
+        }*/
         button.setOnClickListener(new View.OnClickListener() {
             boolean isHidden = false;
             @Override
             public void onClick(View v) {
                 if (isHidden) {
                     uiGroup.setVisibility(View.VISIBLE); // Show UI elements
+                    //attachController();
                 } else {
                     uiGroup.setVisibility(View.INVISIBLE); // Hide UI elements
+                    //detachController();
                 }
                 preferences.edit().putBoolean("controlsVisible", !isHidden).apply();
                 isHidden = !isHidden; // Toggle state
diff --git a/libultraship b/libultraship
index 2860d3df9..e823c0fa7 160000
--- a/libultraship
+++ b/libultraship
@@ -1 +1 @@
-Subproject commit 2860d3df9cc4f21e1e97470831b47d99833d3d8a
+Subproject commit e823c0fa72f667a2f6f90ff69d03ec430eeaff15
diff --git a/mm/2s2h/Enhancements/Camera/FreeLook.cpp b/mm/2s2h/Enhancements/Camera/FreeLook.cpp
index d89de6499..0146969ff 100644
--- a/mm/2s2h/Enhancements/Camera/FreeLook.cpp
+++ b/mm/2s2h/Enhancements/Camera/FreeLook.cpp
@@ -101,8 +101,8 @@ bool Camera_FreeLook(Camera* camera) {
 
 #ifdef __ANDROID__
     if(Ship::Mobile::IsUsingTouchscreenControls()) {
-        yawDiff = -Ship::Mobile::GetCameraYaw()*10.0f;
-        pitchDiff = Ship::Mobile::GetCameraPitch()*10.0f;
+        yawDiff += -Ship::Mobile::GetCameraYaw()*10.0f;
+        pitchDiff += Ship::Mobile::GetCameraPitch()*10.0f;
     }
 #endif