diff --git a/app_pojavlauncher/src/main/assets/language_list.txt b/app_pojavlauncher/src/main/assets/language_list.txt
new file mode 100644
index 000000000..a450fec85
--- /dev/null
+++ b/app_pojavlauncher/src/main/assets/language_list.txt
@@ -0,0 +1,34 @@
+values-af-rZA
+values-ar-rSA
+values-ba-rRU
+values-ca-rES
+values-cs-rCZ
+values-da-rDK
+values-de-rDE
+values-el-rGR
+values-en-rGB
+values-en-rUS
+values-es-rES
+values-fi-rFI
+values-fr-rFR
+values-hu-rHU
+values-in-rID
+values-it-rIT
+values-iw-rIL
+values-ja-rJP
+values-kk-rKZ
+values-ko-rKR
+values-nl-rNL
+values-no-rNO
+values-pl-rPL
+values-pt-rBR
+values-pt-rPT
+values-ro-rRO
+values-ru-rRU
+values-sr-rSP
+values-sv-rSE
+values-tr-rTR
+values-uk-rUA
+values-vi-rVN
+values-zh-rCN
+values-zh-rTW
diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/BaseMainActivity.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/BaseMainActivity.java
index fcc7203a9..648c8fc69 100644
--- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/BaseMainActivity.java
+++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/BaseMainActivity.java
@@ -365,7 +365,7 @@ public class BaseMainActivity extends LoggableActivity {
                     // System.out.println("Pre touch, isTouchInHotbar=" + Boolean.toString(isTouchInHotbar) + ", action=" + MotionEvent.actionToString(e.getActionMasked()));
                    /* int x = ((int) e.getX()) / scaleFactor;
                     int y = ((int) e.getY()) / scaleFactor;*/
-                    if(e.getHistorySize() > 0) {
+                    if(e.getHistorySize() > 0 && CallbackBridge.isGrabbing()) {
                         x += (int)(e.getX() - e.getHistoricalX(0));
                         y += (int)(e.getY() - e.getHistoricalY(0));
                     }
@@ -373,6 +373,7 @@ public class BaseMainActivity extends LoggableActivity {
                         x = (int) e.getX();
                         y = (int) e.getY();
                     }
+
                     int hudKeyHandled = handleGuiBar((int)e.getX(), (int)e.getY());
                     if (!CallbackBridge.isGrabbing() && gestureDetector.onTouchEvent(e)) {
                         if (hudKeyHandled != -1) {
diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/Tools.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/Tools.java
index 2fc0d10a2..d600cbc8d 100644
--- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/Tools.java
+++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/Tools.java
@@ -69,10 +69,10 @@ public final class Tools
         int mcReleaseDate = Integer.parseInt(versionInfo.releaseTime.substring(0, 10).replace("-", ""));
         // 13w17a: 20130425
         // 13w18a: 20130502
-        if (mcReleaseDate < 20130502 && versionInfo.minimumLauncherVersion <= 4){
+        if (mcReleaseDate < 20130502 && versionInfo.minimumLauncherVersion < 9){
+            ctx.appendlnToLog("AWT-enabled version detected! ("+mcReleaseDate+")");
             javaArgList.add("-Djava.awt.headless=false");
-
-            // Caciocavallo config 
+            // Caciocavallo config AWT-enabled version
             javaArgList.add("-Dcacio.managed.screensize=" + CallbackBridge.windowWidth + "x" + CallbackBridge.windowHeight);
             javaArgList.add("-Dcacio.font.fontmanager=net.java.openjdk.cacio.ctc.CTCFontManager");
             // javaArgList.add("-Dcacio.font.fontscaler=sun.font.FreetypeFontScaler");
@@ -91,6 +91,8 @@ public final class Tools
                 }
             }
             javaArgList.add(cacioClasspath.toString());
+        }else{
+            ctx.appendlnToLog("Headless version detected! ("+mcReleaseDate+")");
         }
         
         javaArgList.add("-cp");
@@ -98,7 +100,7 @@ public final class Tools
 
         javaArgList.add(versionInfo.mainClass);
         javaArgList.addAll(Arrays.asList(launchArgs));
-
+        ctx.appendlnToLog("full args: "+javaArgList.toString());
         JREUtils.launchJavaVM(ctx, javaArgList);
     }
     
diff --git a/app_pojavlauncher/src/main/res/drawable-hdpi/ic_launcher.png b/app_pojavlauncher/src/main/res/drawable-hdpi/ic_launcher.png
index dec611dc2..c87ede6bb 100644
Binary files a/app_pojavlauncher/src/main/res/drawable-hdpi/ic_launcher.png and b/app_pojavlauncher/src/main/res/drawable-hdpi/ic_launcher.png differ
diff --git a/app_pojavlauncher/src/main/res/drawable-mdpi/ic_launcher.png b/app_pojavlauncher/src/main/res/drawable-mdpi/ic_launcher.png
index 5e57ab6bf..2034c047b 100644
Binary files a/app_pojavlauncher/src/main/res/drawable-mdpi/ic_launcher.png and b/app_pojavlauncher/src/main/res/drawable-mdpi/ic_launcher.png differ
diff --git a/app_pojavlauncher/src/main/res/drawable-xhdpi/ic_launcher.png b/app_pojavlauncher/src/main/res/drawable-xhdpi/ic_launcher.png
index 2dc2e632d..73b0e94b8 100644
Binary files a/app_pojavlauncher/src/main/res/drawable-xhdpi/ic_launcher.png and b/app_pojavlauncher/src/main/res/drawable-xhdpi/ic_launcher.png differ
diff --git a/app_pojavlauncher/src/main/res/drawable-xxhdpi/ic_launcher.png b/app_pojavlauncher/src/main/res/drawable-xxhdpi/ic_launcher.png
index fe4400a59..6637b832f 100644
Binary files a/app_pojavlauncher/src/main/res/drawable-xxhdpi/ic_launcher.png and b/app_pojavlauncher/src/main/res/drawable-xxhdpi/ic_launcher.png differ
diff --git a/app_pojavlauncher/src/main/res/drawable-xxxhdpi/ic_launcher.png b/app_pojavlauncher/src/main/res/drawable-xxxhdpi/ic_launcher.png
index f0db29f28..66d2cd139 100644
Binary files a/app_pojavlauncher/src/main/res/drawable-xxxhdpi/ic_launcher.png and b/app_pojavlauncher/src/main/res/drawable-xxxhdpi/ic_launcher.png differ
diff --git a/app_pojavlauncher/src/main/res/drawable/mojang_logo.png b/app_pojavlauncher/src/main/res/drawable/pojav_logo.png
similarity index 100%
rename from app_pojavlauncher/src/main/res/drawable/mojang_logo.png
rename to app_pojavlauncher/src/main/res/drawable/pojav_logo.png
diff --git a/app_pojavlauncher/src/main/res/layout/bottom_bar.xml b/app_pojavlauncher/src/main/res/layout/bottom_bar.xml
index a4b8709fa..5e94fddf5 100644
--- a/app_pojavlauncher/src/main/res/layout/bottom_bar.xml
+++ b/app_pojavlauncher/src/main/res/layout/bottom_bar.xml
@@ -18,7 +18,7 @@
     <ImageView
         android:layout_width="112dp"
         android:layout_height="match_parent"
-        android:src="@drawable/mojang_logo"
+        android:src="@drawable/pojav_logo"
         android:layout_alignParentRight="true"
         android:padding="5dp"
         android:background="#000000"
diff --git a/jre_lwjgl3glfw/src/main/java/org/lwjgl/input/GLFWInputImplementation.java b/jre_lwjgl3glfw/src/main/java/org/lwjgl/input/GLFWInputImplementation.java
index f3972f456..82ec265a2 100644
--- a/jre_lwjgl3glfw/src/main/java/org/lwjgl/input/GLFWInputImplementation.java
+++ b/jre_lwjgl3glfw/src/main/java/org/lwjgl/input/GLFWInputImplementation.java
@@ -156,7 +156,7 @@ public class GLFWInputImplementation implements InputImplementation {
         event_buffer.put(button).put(state);
         //always put deltas when grabbed
         if (grab) {
-            event_buffer.putInt(acoord1-mouseLastX).putInt(acoord2-mouseLastY);
+            event_buffer.putInt(acoord1-mouseX).putInt(acoord2-mouseY);
         }else{
             event_buffer.putInt(acoord1).putInt(acoord2);
         }