diff --git a/JGE/src/qt/corewrapper.cpp b/JGE/src/qt/corewrapper.cpp
index 87434832c..120c7ad38 100644
--- a/JGE/src/qt/corewrapper.cpp
+++ b/JGE/src/qt/corewrapper.cpp
@@ -133,6 +133,7 @@ void WagicCore::timerEvent( QTimerEvent* )
     m_engine->SetDelta((float)dt / 1000.0f);
     m_engine->Update((float)dt / 1000.0f);
 
+    done();
     update();
 }
 
diff --git a/projects/mtg/Android/build.xml b/projects/mtg/Android/build.xml
index 73c1a0ac6..8a4d8e5ad 100644
--- a/projects/mtg/Android/build.xml
+++ b/projects/mtg/Android/build.xml
@@ -1,67 +1,85 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project name="Wagic">
+<project name="Wagic" default="help">
 
     <!-- The local.properties file is created and updated by the 'android' tool.
-         It contains the path to the SDK. It should *NOT* be checked in in Version
-         Control Systems. -->
-    <property file="local.properties" />
+         It contains the path to the SDK. It should *NOT* be checked into
+         Version Control Systems. -->
+    <loadproperties srcFile="local.properties" />
 
-    <!-- The build.properties file can be created by you and is never touched
-         by the 'android' tool. This is the place to change some of the default property values
-         used by the Ant rules.
+    <!-- The ant.properties file can be created by you. It is only edited by the
+         'android' tool to add properties to it.
+         This is the place to change some Ant specific build properties.
          Here are some properties you may want to change/update:
 
-         application.package
-             the name of your application package as defined in the manifest. Used by the
-             'uninstall' rule.
          source.dir
-             the name of the source directory. Default is 'src'.
+             The name of the source directory. Default is 'src'.
          out.dir
-             the name of the output directory. Default is 'bin'.
+             The name of the output directory. Default is 'bin'.
 
-         Properties related to the SDK location or the project target should be updated
-          using the 'android' tool with the 'update' action.
+         For other overridable properties, look at the beginning of the rules
+         files in the SDK, at tools/ant/build.xml
 
-         This file is an integral part of the build system for your application and
-         should be checked in in Version Control Systems.
+         Properties related to the SDK location or the project target should
+         be updated using the 'android' tool with the 'update' action.
+
+         This file is an integral part of the build system for your
+         application and should be checked into Version Control Systems.
 
          -->
-    <property file="build.properties" />
+    <property file="ant.properties" />
 
-    <!-- The default.properties file is created and updated by the 'android' tool, as well
-         as ADT.
-         This file is an integral part of the build system for your application and
-         should be checked in in Version Control Systems. -->
-    <property file="default.properties" />
+    <!-- The project.properties file is created and updated by the 'android'
+         tool, as well as ADT.
 
-    <!-- Custom Android task to deal with the project target, and import the proper rules.
-         This requires ant 1.6.0 or above. -->
-    <path id="android.antlibs">
-        <pathelement path="${sdk.dir}/tools/lib/anttasks.jar" />
-        <pathelement path="${sdk.dir}/tools/lib/sdklib.jar" />
-        <pathelement path="${sdk.dir}/tools/lib/androidprefs.jar" />
-        <pathelement path="${sdk.dir}/tools/lib/apkbuilder.jar" />
-        <pathelement path="${sdk.dir}/tools/lib/jarutils.jar" />
-    </path>
+         This contains project specific properties such as project target, and library
+         dependencies. Lower level build properties are stored in ant.properties
+         (or in .classpath for Eclipse projects).
 
-    <taskdef name="setup"
-        classname="com.android.ant.SetupTask"
-        classpathref="android.antlibs" />
+         This file is an integral part of the build system for your
+         application and should be checked into Version Control Systems. -->
+    <loadproperties srcFile="project.properties" />
 
-    <!-- Execute the Android Setup task that will setup some properties specific to the target,
-         and import the build rules files.
+    <!-- quick check on sdk.dir -->
+    <fail
+            message="sdk.dir is missing. Make sure to generate local.properties using 'android update project'"
+            unless="sdk.dir"
+    />
 
-         The rules file is imported from
-            <SDK>/platforms/<target_platform>/templates/android_rules.xml
 
-         To customize some build steps for your project:
-         - copy the content of the main node <project> from android_rules.xml
-         - paste it in this build.xml below the <setup /> task.
-         - disable the import by changing the setup task below to <setup import="false" />
+<!-- extension targets. Uncomment the ones where you want to do custom work
+     in between standard targets -->
+<!--
+    <target name="-pre-build">
+    </target>
+    <target name="-pre-compile">
+    </target>
 
-         This will ensure that the properties are setup correctly but that your customized
-         build steps are used.
+    /* This is typically used for code obfuscation.
+       Compiled code location: ${out.classes.absolute.dir}
+       If this is not done in place, override ${out.dex.input.absolute.dir} */
+    <target name="-post-compile">
+    </target>
+-->
+
+    <!-- Import the actual build file.
+
+         To customize existing targets, there are two options:
+         - Customize only one target:
+             - copy/paste the target into this file, *before* the
+               <import> task.
+             - customize it to your needs.
+         - Customize the whole content of build.xml
+             - copy/paste the content of the rules files (minus the top node)
+               into this file, replacing the <import> task.
+             - customize to your needs.
+
+         ***********************
+         ****** IMPORTANT ******
+         ***********************
+         In all cases you must update the value of version-tag below to read 'custom' instead of an integer,
+         in order to avoid having your file be overridden by tools such as "android update project"
     -->
-    <setup />
+    <!-- version-tag: 1 -->
+    <import file="${sdk.dir}/tools/ant/build.xml" />
 
 </project>
diff --git a/projects/mtg/qml/QmlWagic/main.qml b/projects/mtg/qml/QmlWagic/main.qml
index 69d21f9d0..60da11a20 100644
--- a/projects/mtg/qml/QmlWagic/main.qml
+++ b/projects/mtg/qml/QmlWagic/main.qml
@@ -137,7 +137,10 @@ Rectangle {
         }
 
         onPressAndHold: {
-            wagic.doMenu()
+            if(Math.abs(lastX-mouse.x)<50 && Math.abs(lastY-mouse.y)<50)
+            {
+                wagic.doMenu()
+            }
         }
     }
     function resize(){
diff --git a/projects/mtg/src/GameStateShop.cpp b/projects/mtg/src/GameStateShop.cpp
index cd06c0f61..c7f830071 100644
--- a/projects/mtg/src/GameStateShop.cpp
+++ b/projects/mtg/src/GameStateShop.cpp
@@ -810,28 +810,7 @@ void GameStateShop::ButtonPressed(int controllerId, int controlId)
 
 void GameStateShop::OnScroll(int inXVelocity, int inYVelocity)
 {
-    if (mStage == STAGE_ASK_ABOUT)
-    {
-        bool flickHorizontal = (abs(inXVelocity) > abs(inYVelocity));
-        if (flickHorizontal)
-        {
-            bool flickRight = inXVelocity > 0 ? true : false;
-            if (flickRight)
-                mEngine->HoldKey_NoRepeat(JGE_BTN_RIGHT);
-            else
-                mEngine->HoldKey_NoRepeat(JGE_BTN_LEFT);
-        }
-        else
-        {
-            bool flickUp = inYVelocity < 0 ? true : false;
-            if (flickUp)
-                mEngine->HoldKey_NoRepeat(JGE_BTN_UP);
-            else
-                mEngine->HoldKey_NoRepeat(JGE_BTN_DOWN);
-        }
-        
-    }
-    else if (abs(inXVelocity) > 200)
+    if (abs(inXVelocity) > 200)
     {
         bool flickRight = (inXVelocity >= 0);
         if (flickRight)