diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index a2c2f1d6..2c2cdd74 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -4,7 +4,7 @@
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
 	package="in.celest.xash3d.hl"
-	android:versionCode="0"
+	android:versionCode="1"
 	android:versionName="0.18"
 	android:installLocation="auto">
 
diff --git a/jni/src/NanoGL/nanogl b/jni/src/NanoGL/nanogl
index fba28cff..53620242 160000
--- a/jni/src/NanoGL/nanogl
+++ b/jni/src/NanoGL/nanogl
@@ -1 +1 @@
-Subproject commit fba28cfff8c488b83b052b92a9f58678c90f2afe
+Subproject commit 536202427f3391d23f28e6a81443523da0ac1051
diff --git a/src/in/celest/xash3d/XashActivity.java b/src/in/celest/xash3d/XashActivity.java
index 1dcb106c..7087febe 100644
--- a/src/in/celest/xash3d/XashActivity.java
+++ b/src/in/celest/xash3d/XashActivity.java
@@ -980,12 +980,18 @@ class JoystickHandler_v12 extends JoystickHandler
 			switch( range.getAxis() )
 			{
 			// typical axes
+			// move
 			case MotionEvent.AXIS_X:   prevSide = XashActivity.performEngineAxisEvent(cur, XashActivity.JOY_AXIS_SIDE,  prevSide, dead); break;
 			case MotionEvent.AXIS_Y:   prevFwd  = XashActivity.performEngineAxisEvent(cur, XashActivity.JOY_AXIS_FWD,   prevFwd,  dead); break;
-			case MotionEvent.AXIS_Z:   prevPtch = XashActivity.performEngineAxisEvent(cur, XashActivity.JOY_AXIS_PITCH, prevPtch, dead); break;
-			case MotionEvent.AXIS_RZ:  prevYaw  = XashActivity.performEngineAxisEvent(cur, XashActivity.JOY_AXIS_YAW,   prevYaw,  dead); break;
+			
+			// rotate. Invert, so by default this works as it's should
+			case MotionEvent.AXIS_Z:   prevPtch = XashActivity.performEngineAxisEvent(-cur, XashActivity.JOY_AXIS_PITCH, prevPtch, dead); break;
+			case MotionEvent.AXIS_RZ:  prevYaw  = XashActivity.performEngineAxisEvent(-cur, XashActivity.JOY_AXIS_YAW,   prevYaw,  dead); break;
+			
+			// trigger
 			case MotionEvent.AXIS_RTRIGGER:	prevLT = XashActivity.performEngineAxisEvent(cur, XashActivity.JOY_AXIS_RT, prevLT,   dead); break;
 			case MotionEvent.AXIS_LTRIGGER:	prevRT = XashActivity.performEngineAxisEvent(cur, XashActivity.JOY_AXIS_LT, prevRT,   dead); break;
+			
 			// hats
 			case MotionEvent.AXIS_HAT_X: prevHX = XashActivity.performEngineHatEvent(cur, true, prevHX); break;
 			case MotionEvent.AXIS_HAT_Y: prevHY = XashActivity.performEngineHatEvent(cur, false, prevHY); break;
diff --git a/src/org/json b/src/org/json
index 9a81b403..4e8e24d4 160000
--- a/src/org/json
+++ b/src/org/json
@@ -1 +1 @@
-Subproject commit 9a81b40334ff2eba531478d013654c5d1b12ad24
+Subproject commit 4e8e24d49de6e9fa1afeaa992a6b06272858b160