diff --git a/forge-adventure/pom.xml b/forge-adventure/pom.xml
index cb4ca672937..3d696393376 100644
--- a/forge-adventure/pom.xml
+++ b/forge-adventure/pom.xml
@@ -19,6 +19,13 @@
             <id>jitpack.io</id>
             <url>https://jitpack.io</url>
         </repository>
+        <repository>
+        <id>4thline-repo</id>
+        <url>http://4thline.org/m2</url>
+        <snapshots>
+            <enabled>false</enabled>
+        </snapshots>
+    </repository>
     </repositories>
     <build>
         <sourceDirectory>src/main/java</sourceDirectory>
@@ -62,7 +69,7 @@
                                 <jar>${project.build.finalName}-jar-with-dependencies.jar</jar>
                                 <dontWrapJar>true</dontWrapJar>
                                 <errTitle>forge</errTitle>
-                                <icon>src/main/config/forge-adventure.ico</icon>
+                                <icon>src/main/config/forge-adventure-editor.ico</icon>
                                 <classPath>
                                     <mainClass>forge.adventure.Main</mainClass>
                                     <addDependencies>false</addDependencies>
@@ -110,7 +117,7 @@
                                 <dontWrapJar>true</dontWrapJar>
                                 <errTitle>forge</errTitle>
                                 <downloadUrl>https://www.oracle.com/java/technologies/downloads/</downloadUrl>
-                                <icon>src/main/config/forge-adventure.ico</icon>
+                                <icon>src/main/config/forge-adventure-editor.ico</icon>
                                 <classPath>
                                     <mainClass>forge.adventure.Main</mainClass>
                                     <addDependencies>false</addDependencies>
@@ -297,12 +304,6 @@
             <version>22.0.0</version>
             <scope>compile</scope>
         </dependency>
-        <dependency>
-            <groupId>forge</groupId>
-            <artifactId>forge-gui-mobile</artifactId>
-            <version>1.6.54-SNAPSHOT</version>
-            <scope>compile</scope>
-        </dependency>
         <dependency>
             <groupId>com.badlogicgames.gdx-controllers</groupId>
             <artifactId>gdx-controllers-desktop</artifactId>
diff --git a/forge-adventure/src/main/config/forge-adventure-mac.sh b/forge-adventure/src/main/config/forge-adventure-editor-mac.sh
similarity index 100%
rename from forge-adventure/src/main/config/forge-adventure-mac.sh
rename to forge-adventure/src/main/config/forge-adventure-editor-mac.sh
diff --git a/forge-adventure/src/main/config/forge-adventure.cmd b/forge-adventure/src/main/config/forge-adventure-editor.cmd
similarity index 100%
rename from forge-adventure/src/main/config/forge-adventure.cmd
rename to forge-adventure/src/main/config/forge-adventure-editor.cmd
diff --git a/forge-adventure/src/main/config/forge-adventure.command b/forge-adventure/src/main/config/forge-adventure-editor.command
similarity index 100%
rename from forge-adventure/src/main/config/forge-adventure.command
rename to forge-adventure/src/main/config/forge-adventure-editor.command
diff --git a/forge-adventure/src/main/config/forge-adventure-editor.ico b/forge-adventure/src/main/config/forge-adventure-editor.ico
new file mode 100644
index 00000000000..d9d869a7dfb
Binary files /dev/null and b/forge-adventure/src/main/config/forge-adventure-editor.ico differ
diff --git a/forge-adventure/src/main/config/forge-adventure.sh b/forge-adventure/src/main/config/forge-adventure-editor.sh
similarity index 100%
rename from forge-adventure/src/main/config/forge-adventure.sh
rename to forge-adventure/src/main/config/forge-adventure-editor.sh
diff --git a/forge-gui-desktop/pom.xml b/forge-gui-desktop/pom.xml
index ac3df2e206b..809b03181a0 100644
--- a/forge-gui-desktop/pom.xml
+++ b/forge-gui-desktop/pom.xml
@@ -560,11 +560,17 @@
                                             <fileset dir="${project.build.directory}" includes="forge-java8.exe" />
                                             <fileset dir="${project.build.directory}" includes="forge.exe" />
                                             <fileset dir="${project.build.directory}" includes="${project.build.finalName}-jar-with-dependencies.jar" />
-                                            <fileset dir="${project.build.directory}/../../forge-adventure/target" includes="forge-adventure.exe" />
-                                            <fileset dir="${project.build.directory}/../../forge-adventure/target" includes="forge-adventure-java8.exe" />
-                                            <fileset dir="${project.build.directory}/../../forge-adventure/target" includes="forge-adventure.sh" />
-                                            <fileset dir="${project.build.directory}/../../forge-adventure/target" includes="forge-adventure.command" />
-                                            <fileset dir="${project.build.directory}/../../forge-adventure/target" includes="forge-adventure.cmd" />
+                                            <fileset dir="${project.build.directory}/../../forge-gui-mobile-dev/target" includes="forge-adventure.exe" />
+                                            <fileset dir="${project.build.directory}/../../forge-gui-mobile-dev/target" includes="forge-adventure-java8.exe" />
+                                            <fileset dir="${project.build.directory}/../../forge-gui-mobile-dev/target" includes="forge-adventure.sh" />
+                                            <fileset dir="${project.build.directory}/../../forge-gui-mobile-dev/target" includes="forge-adventure.command" />
+                                            <fileset dir="${project.build.directory}/../../forge-gui-mobile-dev/target" includes="forge-adventure.cmd" />
+                                            <fileset dir="${project.build.directory}/../../forge-gui-mobile-dev/target" includes="forge-gui-mobile-dev-${project.version}-jar-with-dependencies.jar" />
+                                            <fileset dir="${project.build.directory}/../../forge-adventure/target" includes="forge-adventure-editor.exe" />
+                                            <fileset dir="${project.build.directory}/../../forge-adventure/target" includes="forge-adventure-editor-java8.exe" />
+                                            <fileset dir="${project.build.directory}/../../forge-adventure/target" includes="forge-adventure-editor.sh" />
+                                            <fileset dir="${project.build.directory}/../../forge-adventure/target" includes="forge-adventure-editor.command" />
+                                            <fileset dir="${project.build.directory}/../../forge-adventure/target" includes="forge-adventure-editor.cmd" />
                                             <fileset dir="${project.build.directory}/../../forge-adventure/target" includes="forge-adventure-${project.version}-jar-with-dependencies.jar" />
                                         </copy>
                                         <mkdir dir="${project.build.directory}/${project.build.finalName}/res/cardsfolder" />
@@ -575,10 +581,15 @@
                                         <chmod file="${project.build.directory}/${project.build.finalName}/forge-adventure.sh" perm="a+rx" />
                                         <chmod file="${project.build.directory}/${project.build.finalName}/forge-adventure.command" perm="a+rx" />
                                         <chmod file="${project.build.directory}/${project.build.finalName}/forge-adventure.cmd" perm="a+rx" />
+                                        <chmod file="${project.build.directory}/${project.build.finalName}/forge-adventure-editor.sh" perm="a+rx" />
+                                        <chmod file="${project.build.directory}/${project.build.finalName}/forge-adventure-editor.command" perm="a+rx" />
+                                        <chmod file="${project.build.directory}/${project.build.finalName}/forge-adventure-editor.cmd" perm="a+rx" />
                                         <chmod file="${project.build.directory}/${project.build.finalName}/forge-java8.exe" perm="a+rx" />
                                         <chmod file="${project.build.directory}/${project.build.finalName}/forge.exe" perm="a+rx" />
                                         <chmod file="${project.build.directory}/${project.build.finalName}/forge-adventure.exe" perm="a+rx" />
                                         <chmod file="${project.build.directory}/${project.build.finalName}/forge-adventure-java8.exe" perm="a+rx" />
+                                        <chmod file="${project.build.directory}/${project.build.finalName}/forge-adventure-editor.exe" perm="a+rx" />
+                                        <chmod file="${project.build.directory}/${project.build.finalName}/forge-adventure-editor-java8.exe" perm="a+rx" />
                                         <tar destfile="${project.build.directory}/${project.build.finalName}.tar.bz2" compression="bzip2">
                                             <tarfileset filemode="755" dir="${project.build.directory}/${project.build.finalName}">
                                                 <include name="forge.sh" />
diff --git a/forge-gui-mobile-dev/src/forge/app/Main.java b/forge-gui-mobile-dev/src/forge/app/Main.java
index d44e10a6b25..363d83480c9 100644
--- a/forge-gui-mobile-dev/src/forge/app/Main.java
+++ b/forge-gui-mobile-dev/src/forge/app/Main.java
@@ -22,6 +22,8 @@ import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.nio.file.Files;
+import java.nio.file.Paths;
 
 public class Main {
     public static void main(String[] args) {
@@ -46,18 +48,27 @@ public class Main {
         }
 
         // Set this to "true" to make the mobile game port run as a full-screen desktop application
-        boolean desktopMode = cmd.hasOption("fullscreen");
+        boolean desktopMode = true;//cmd.hasOption("fullscreen");
         // Set this to the location where you want the mobile game port to look for assets when working as a full-screen desktop application
         // (uncomment the bottom version and comment the top one to load the res folder from the current folder the .jar is in if you would
         // like to make the game load from a desktop game folder configuration).
-        String desktopModeAssetsDir = "../forge-gui/";
-        //String desktopModeAssetsDir = "./";
+        //String desktopModeAssetsDir = "../forge-gui/";
+        String desktopModeAssetsDir = "./";
+        if(!Files.exists(Paths.get(desktopModeAssetsDir+"res")))
+            desktopModeAssetsDir = "../forge-gui/";//try IDE run
 
         // Assets directory used when the game fully emulates smartphone/tablet mode (desktopMode = false), useful when debugging from IDE
-        String assetsDir = AssetsDownloader.SHARE_DESKTOP_ASSETS ? "../forge-gui/" : "testAssets/";
+        String assetsDir ;
         if (!AssetsDownloader.SHARE_DESKTOP_ASSETS) {
+            assetsDir= "testAssets/";
             FileUtil.ensureDirectoryExists(assetsDir);
         }
+        else
+        {
+            assetsDir= "./";
+            if(!Files.exists(Paths.get(assetsDir+"res")))
+                assetsDir = "../forge-gui/";
+        }
 
         // Place the file "switch_orientation.ini" to your assets folder to make the game switch to landscape orientation (unless desktopMode = true)
         String switchOrientationFile = assetsDir + "switch_orientation.ini";
@@ -73,6 +84,7 @@ public class Main {
                 screenWidth = Integer.parseInt(res[0].trim());
                 screenHeight = Integer.parseInt(res[1].trim());
             }
+            desktopMode=false;
         }
 
         // Fullscreen width and height for desktop mode (desktopMode = true)
diff --git a/forge-gui-mobile/src/forge/adventure/character/CharacterSprite.java b/forge-gui-mobile/src/forge/adventure/character/CharacterSprite.java
index 8fd5205f4e0..4604d138c5d 100644
--- a/forge-gui-mobile/src/forge/adventure/character/CharacterSprite.java
+++ b/forge-gui-mobile/src/forge/adventure/character/CharacterSprite.java
@@ -20,7 +20,7 @@ public class CharacterSprite extends MapActor {
     private Animation<TextureRegion> currentAnimation = null;
     private AnimationTypes currentAnimationType = AnimationTypes.Idle;
     private AnimationDirections currentAnimationDir = AnimationDirections.None;
-    private Array<Sprite> avatar=new Array<>();
+    private final Array<Sprite> avatar=new Array<>();
     public boolean hidden = false;
 
     public CharacterSprite(int id,String path) {
@@ -40,10 +40,6 @@ public class CharacterSprite extends MapActor {
     protected void load(String path) {
         if(path==null||path.isEmpty())return;
         TextureAtlas atlas = Config.instance().getAtlas(path);
-        /*
-        for (Texture texture : new ObjectSet.ObjectSetIterator<>( atlas.getTextures()))
-            texture.setFilter(Texture.TextureFilter.Nearest, Texture.TextureFilter.Nearest);
-         */
         animations.clear();
         for (AnimationTypes stand : AnimationTypes.values()) {
             if (stand == AnimationTypes.Avatar) {
diff --git a/forge-gui-mobile/src/forge/adventure/character/MapActor.java b/forge-gui-mobile/src/forge/adventure/character/MapActor.java
index e6a39646a85..fd8e4de2215 100644
--- a/forge-gui-mobile/src/forge/adventure/character/MapActor.java
+++ b/forge-gui-mobile/src/forge/adventure/character/MapActor.java
@@ -25,7 +25,7 @@ public class MapActor extends Actor {
         removeIfEffectsAreFinished=true;
     }
 
-    class CurrentEffect
+    static class CurrentEffect
     {
         public CurrentEffect(String path,ParticleEffect effect,Vector2 offset,boolean overlay)
         {
@@ -35,7 +35,7 @@ public class MapActor extends Actor {
             this.overlay=overlay;
         }
 
-        private String path;
+        private final String path;
         public ParticleEffect effect;
         public Vector2 offset;
         public boolean overlay=true;
@@ -63,7 +63,7 @@ public class MapActor extends Actor {
     {
         ParticleEffect effect = new ParticleEffect();
         effect.load(Config.instance().getFile(path),Config.instance().getFile(path).parent());
-        effects.add(new CurrentEffect(path,effect,offset,overlay));
+        effects.add(new CurrentEffect(path, effect, offset, overlay));
         if(duration!=0)//ParticleEffect.setDuration uses an integer for some reason
         {
             for(ParticleEmitter emitter:effect.getEmitters()){
diff --git a/forge-gui-mobile/src/forge/adventure/character/RewardSprite.java b/forge-gui-mobile/src/forge/adventure/character/RewardSprite.java
index a6ba72c8b55..47cd0fe395c 100644
--- a/forge-gui-mobile/src/forge/adventure/character/RewardSprite.java
+++ b/forge-gui-mobile/src/forge/adventure/character/RewardSprite.java
@@ -11,7 +11,7 @@ import forge.adventure.util.Reward;
  */
 
 public class RewardSprite extends CharacterSprite {
-    private final String default_reward = "[\n" +
+    private final static String default_reward = "[\n" +
             "\t\t{\n" +
             "\t\t\t\"type\": \"gold\",\n" +
             "\t\t\t\"count\": 10,\n" +
diff --git a/forge-gui-mobile/src/forge/adventure/data/BiomeSpriteData.java b/forge-gui-mobile/src/forge/adventure/data/BiomeSpriteData.java
index 3043eadce73..bd188ebb3b8 100644
--- a/forge-gui-mobile/src/forge/adventure/data/BiomeSpriteData.java
+++ b/forge-gui-mobile/src/forge/adventure/data/BiomeSpriteData.java
@@ -26,7 +26,7 @@ public class BiomeSpriteData implements SaveFileContent {
         startArea=data.readDouble("startArea");
         endArea=data.readDouble("endArea");
         density=data.readDouble("density");
-        resolution=data.readDouble("resolution");;
+        resolution=data.readDouble("resolution");
         layer=data.readInt("layer");
     }
 
diff --git a/forge-gui-mobile/src/forge/adventure/data/BiomeStructureData.java b/forge-gui-mobile/src/forge/adventure/data/BiomeStructureData.java
index cc2271953be..60117944564 100644
--- a/forge-gui-mobile/src/forge/adventure/data/BiomeStructureData.java
+++ b/forge-gui-mobile/src/forge/adventure/data/BiomeStructureData.java
@@ -45,10 +45,14 @@ public class BiomeStructureData {
         this.structureAtlasPath=biomeStructureData.structureAtlasPath;
         this.sourcePath=biomeStructureData.sourcePath;
         this.maskPath=biomeStructureData.maskPath;
+        this.periodicInput=biomeStructureData.periodicInput;
         this.x=biomeStructureData.x;
         this.y=biomeStructureData.y;
         this.width=biomeStructureData.width;
         this.height=biomeStructureData.height;
+        this.periodicOutput=biomeStructureData.periodicOutput;
+        this.symmetry=biomeStructureData.symmetry;
+        this.ground=biomeStructureData.ground;
         this.randomPosition=biomeStructureData.randomPosition;
         if(biomeStructureData.mappingInfo!=null)
         {
diff --git a/forge-gui-mobile/src/forge/adventure/data/EffectData.java b/forge-gui-mobile/src/forge/adventure/data/EffectData.java
index a41f9e7bfc1..77c12986070 100644
--- a/forge-gui-mobile/src/forge/adventure/data/EffectData.java
+++ b/forge-gui-mobile/src/forge/adventure/data/EffectData.java
@@ -65,7 +65,7 @@ public class EffectData implements Serializable {
         if(name != null && !name.isEmpty()) description += name + "\n";
         if(colorView) description += "Manasight.\n";
         if(lifeModifier != 0)
-            description += "Life: " + ((lifeModifier > 0) ? "+" : "") + lifeModifier + "\n";
+            description += "[+Life] " + ((lifeModifier > 0) ? "+" : "") + lifeModifier + "\n";
         if(startBattleWithCard != null && startBattleWithCard.length != 0)
             description+="Cards on battlefield: \n" + cardNames() + "\n";
         if(changeStartCards != 0)
diff --git a/forge-gui-mobile/src/forge/adventure/data/EnemyData.java b/forge-gui-mobile/src/forge/adventure/data/EnemyData.java
index b4cb9db9622..a1c94c200a5 100644
--- a/forge-gui-mobile/src/forge/adventure/data/EnemyData.java
+++ b/forge-gui-mobile/src/forge/adventure/data/EnemyData.java
@@ -42,6 +42,8 @@ public class EnemyData {
         life           = enemyData.life;
         equipment      = enemyData.equipment;
         colors         = enemyData.colors;
+        teamNumber     = enemyData.teamNumber;
+        nextEnemy     =enemyData.nextEnemy==null?null: new EnemyData(enemyData.nextEnemy);
         if(enemyData.rewards == null) {
             rewards=null;
         } else {
diff --git a/forge-gui-mobile/src/forge/adventure/data/ItemData.java b/forge-gui-mobile/src/forge/adventure/data/ItemData.java
index 294f47b7308..65c337e9dcc 100644
--- a/forge-gui-mobile/src/forge/adventure/data/ItemData.java
+++ b/forge-gui-mobile/src/forge/adventure/data/ItemData.java
@@ -43,6 +43,9 @@ public class ItemData {
         iconName          = cpy.iconName;
         questItem         = cpy.questItem;
         cost              = cpy.cost;
+        usableInPoi       = cpy.usableInPoi;
+        usableOnWorldMap  = cpy.usableOnWorldMap;
+        commandOnUse      = cpy.commandOnUse;
         manaNeeded        = cpy.manaNeeded;
     }
 
@@ -62,7 +65,7 @@ public class ItemData {
             Json json = new Json();
             FileHandle handle = Config.instance().getFile(Paths.ITEMS);
             if (handle.exists()) {
-                Array readJson = json.fromJson(Array.class, ItemData.class, handle);
+                Array<ItemData> readJson = json.fromJson(Array.class, ItemData.class, handle);
                 itemList = readJson;
 
             }
@@ -88,7 +91,7 @@ public class ItemData {
         if(effect != null)
             result += effect.getDescription();
         if(manaNeeded != 0)
-            result += "Mana cost: "+manaNeeded;
+            result +=  manaNeeded+" [Mana]";
         return result;
     }
 
diff --git a/forge-gui-mobile/src/forge/adventure/data/PointOfInterestData.java b/forge-gui-mobile/src/forge/adventure/data/PointOfInterestData.java
index 412af979dcd..fe888ff566f 100644
--- a/forge-gui-mobile/src/forge/adventure/data/PointOfInterestData.java
+++ b/forge-gui-mobile/src/forge/adventure/data/PointOfInterestData.java
@@ -58,5 +58,7 @@ public class PointOfInterestData {
         sprite=other.sprite;
         map=other.map;
         radiusFactor=other.radiusFactor;
+        offsetX=other.offsetX;
+        offsetY=other.offsetY;
     }
 }
diff --git a/forge-gui-mobile/src/forge/adventure/player/AdventurePlayer.java b/forge-gui-mobile/src/forge/adventure/player/AdventurePlayer.java
index a409d3ad5cd..39d63041b0a 100644
--- a/forge-gui-mobile/src/forge/adventure/player/AdventurePlayer.java
+++ b/forge-gui-mobile/src/forge/adventure/player/AdventurePlayer.java
@@ -66,12 +66,12 @@ public class AdventurePlayer implements Serializable, SaveFileContent {
     private boolean announceCustom = false;
 
     // Signals
-    SignalList onLifeTotalChangeList = new SignalList();
-    SignalList onManaTotalChangeList = new SignalList();
-    SignalList onGoldChangeList      = new SignalList();
-    SignalList onPlayerChangeList    = new SignalList();
-    SignalList onEquipmentChange     = new SignalList();
-    SignalList onBlessing            = new SignalList();
+    final SignalList onLifeTotalChangeList = new SignalList();
+    final SignalList onManaTotalChangeList = new SignalList();
+    final SignalList onGoldChangeList      = new SignalList();
+    final SignalList onPlayerChangeList    = new SignalList();
+    final SignalList onEquipmentChange     = new SignalList();
+    final SignalList onBlessing            = new SignalList();
 
     public AdventurePlayer() { clear(); }
 
@@ -458,7 +458,7 @@ public class AdventurePlayer implements Serializable, SaveFileContent {
 
     public boolean fullHeal() {
         if (life < maxLife) {
-            life = Math.max(maxLife, life);
+            life = maxLife;
             onLifeTotalChangeList.emit();
             return true;
         }
diff --git a/forge-gui-mobile/src/forge/adventure/pointofintrest/PointOfInterestChanges.java b/forge-gui-mobile/src/forge/adventure/pointofintrest/PointOfInterestChanges.java
index 9130d385aac..ec5a953008f 100644
--- a/forge-gui-mobile/src/forge/adventure/pointofintrest/PointOfInterestChanges.java
+++ b/forge-gui-mobile/src/forge/adventure/pointofintrest/PointOfInterestChanges.java
@@ -13,7 +13,7 @@ import java.util.HashSet;
 public class PointOfInterestChanges implements SaveFileContent  {
     private final HashSet<Integer> deletedObjects=new HashSet<>();
     private final HashMap<Integer, HashSet<Integer>> cardsBought = new HashMap<>();
-    private java.util.Map<String, Byte> mapFlags = new HashMap<>();
+    private final java.util.Map<String, Byte> mapFlags = new HashMap<>();
 
     public static class Map extends HashMap<String,PointOfInterestChanges> implements SaveFileContent {
         @Override
diff --git a/forge-gui-mobile/src/forge/adventure/scene/AdventureDeckEditor.java b/forge-gui-mobile/src/forge/adventure/scene/AdventureDeckEditor.java
index dcc922651ca..0422b15c4d2 100644
--- a/forge-gui-mobile/src/forge/adventure/scene/AdventureDeckEditor.java
+++ b/forge-gui-mobile/src/forge/adventure/scene/AdventureDeckEditor.java
@@ -97,7 +97,7 @@ import java.util.Map;
         private final FLabel btnMoreOptions = deckHeader.add(new FLabel.Builder().text("...").font(FSkinFont.get(20)).align(Align.center).pressedColor(Header.BTN_PRESSED_COLOR).build());
 
 
-        boolean isShop=false;
+        boolean isShop;
         public AdventureDeckEditor(boolean createAsShop) {
             super(e -> leave(),getPages());
 
diff --git a/forge-gui-mobile/src/forge/adventure/scene/ArenaScene.java b/forge-gui-mobile/src/forge/adventure/scene/ArenaScene.java
index f2374230a72..283b397d5dc 100644
--- a/forge-gui-mobile/src/forge/adventure/scene/ArenaScene.java
+++ b/forge-gui-mobile/src/forge/adventure/scene/ArenaScene.java
@@ -29,7 +29,7 @@ public class ArenaScene extends UIScene implements IAfterMatch {
     private static ArenaScene object;
     private final float gridSize;
     private ArenaData arenaData;
-    private TextraButton startButton;
+    private final TextraButton startButton;
 
     public static ArenaScene instance() {
         if(object==null)
@@ -37,24 +37,24 @@ public class ArenaScene extends UIScene implements IAfterMatch {
         return object;
     }
 
-    private TextraButton doneButton;
+    private final TextraButton doneButton;
     Dialog startDialog;
     Dialog areYouSureDialog;
-    private TextraLabel goldLabel;
+    private final TextraLabel goldLabel;
 
-    private Group arenaPlane;
-    private Random rand=new Random();
+    private final Group arenaPlane;
+    private final Random rand=new Random();
 
-    Sprite fighterSpot;
-    Sprite lostOverlay;
-    Sprite up;
-    Sprite upWin;
-    Sprite side;
-    Sprite sideWin;
-    Sprite edge;
-    Sprite edgeM;
-    Sprite edgeWin;
-    Sprite edgeWinM;
+    final Sprite fighterSpot;
+    final Sprite lostOverlay;
+    final Sprite up;
+    final Sprite upWin;
+    final Sprite side;
+    final Sprite sideWin;
+    final Sprite edge;
+    final Sprite edgeM;
+    final Sprite edgeWin;
+    final Sprite edgeWinM;
     boolean arenaStarted=false;
     private ArenaScene() {
         super(Forge.isLandscapeMode() ? "ui/arena.json" : "ui/arena_portrait.json");
@@ -98,7 +98,7 @@ public class ArenaScene extends UIScene implements IAfterMatch {
                 if(object!=null&&object.equals(true))
                     startArena();
                 startDialog.hide();
-            };
+            }
         };
         startDialog.text("Do you want to go into the Arena?");
         startDialog.button(Forge.getLocalizer().getMessage("lblYes"), true);
diff --git a/forge-gui-mobile/src/forge/adventure/scene/GameScene.java b/forge-gui-mobile/src/forge/adventure/scene/GameScene.java
index e5f0fd7577d..f6376d54828 100644
--- a/forge-gui-mobile/src/forge/adventure/scene/GameScene.java
+++ b/forge-gui-mobile/src/forge/adventure/scene/GameScene.java
@@ -10,14 +10,9 @@ import forge.adventure.stage.WorldStage;
  * does render the WorldStage and HUD
  */
 public class GameScene extends HudScene {
-    private float cameraWidth = 0f, cameraHeight = 0f;
     public GameScene() {
         super(WorldStage.getInstance());
 
-        if (cameraWidth == 0f)
-            cameraWidth = stage.getCamera().viewportWidth;
-        if (cameraHeight == 0f)
-            cameraHeight = stage.getCamera().viewportHeight;
     }
 
 
diff --git a/forge-gui-mobile/src/forge/adventure/scene/InventoryScene.java b/forge-gui-mobile/src/forge/adventure/scene/InventoryScene.java
index 3f023c735d4..388cf1e581f 100644
--- a/forge-gui-mobile/src/forge/adventure/scene/InventoryScene.java
+++ b/forge-gui-mobile/src/forge/adventure/scene/InventoryScene.java
@@ -30,9 +30,9 @@ public class InventoryScene  extends UIScene {
     TextraLabel itemDescription;
     Dialog confirm;
     Dialog useDialog;
-    private Table inventory;
-    Array<Button> inventoryButtons=new Array<>();
-    HashMap<String,Button> equipmentSlots=new HashMap<>();
+    private final Table inventory;
+    private final Array<Button> inventoryButtons=new Array<>();
+    private final HashMap<String,Button> equipmentSlots=new HashMap<>();
     HashMap<Button,String> itemLocation=new HashMap<>();
     Button selected;
     Button deleteButton;
@@ -54,8 +54,6 @@ public class InventoryScene  extends UIScene {
         itemDescription = ui.findActor("item_description");
         itemDescription.setAlignment(Align.topLeft);
 
-        inventoryButtons=new Array<>();
-        equipmentSlots=new HashMap<>();
 
         Array<Actor> children = ui.getChildren();
         for (int i = 0, n = children.size; i < n; i++)
@@ -79,7 +77,7 @@ public class InventoryScene  extends UIScene {
                                 }
                             }
                             String item=Current.player().itemInSlot(slotName);
-                            if(item!=null&&item!="")
+                            if(item!=null&& !item.equals(""))
                             {
                                 Button changeButton=null;
                                 for(Button invButton:inventoryButtons)
@@ -118,7 +116,7 @@ public class InventoryScene  extends UIScene {
                 if(object!=null&&object.equals(true))
                     delete();
                 confirm.hide();
-            };
+            }
         };
         confirm.text( Controls.newLabel(Forge.getLocalizer().getMessage("lblDelete")));
 
@@ -142,7 +140,7 @@ public class InventoryScene  extends UIScene {
                     triggerUse();
                     useDialog.getColor().a = 0;
                 }
-            };
+            }
         };
 
         useDialog.button(Forge.getLocalizer().getMessage("lblYes"), true);
@@ -178,6 +176,7 @@ public class InventoryScene  extends UIScene {
     public void equip() {
         if(selected == null) return;
         ItemData data = ItemData.getItem(itemLocation.get(selected));
+        if(data==null)return;
         Current.player().equip(data);
         updateInventory();
     }
@@ -192,6 +191,7 @@ public class InventoryScene  extends UIScene {
         if(selected==null)return;
 
         ItemData data = ItemData.getItem(itemLocation.get(selected));
+        if(data==null)return;
         Current.player().addMana(-data.manaNeeded);
         done();
         ConsoleCommandInterpreter.getInstance().command(data.commandOnUse);
@@ -199,6 +199,7 @@ public class InventoryScene  extends UIScene {
     private void use() {
         useDialog.getContentTable().clear();
         ItemData data = ItemData.getItem(itemLocation.get(selected));
+        if(data==null)return;
         useDialog.text("Use "+data.name+"?\n"+data.getDescription());
         useDialog.show(stage);
     }
@@ -218,6 +219,8 @@ public class InventoryScene  extends UIScene {
             return;
         }
         ItemData data = ItemData.getItem(itemLocation.get(actor));
+
+        if(data==null) return;
         deleteButton.setDisabled(data.questItem);
 
         boolean isInPoi = MapStage.getInstance().isInMap();
@@ -230,7 +233,7 @@ public class InventoryScene  extends UIScene {
         if(Current.player().getMana()<data.manaNeeded)
             useButton.setDisabled(true);
 
-        if(data.equipmentSlot==null||data.equipmentSlot=="")
+        if(data.equipmentSlot==null|| data.equipmentSlot.equals(""))
         {
             equipButton.setDisabled(true);
         }
diff --git a/forge-gui-mobile/src/forge/adventure/scene/MapViewScene.java b/forge-gui-mobile/src/forge/adventure/scene/MapViewScene.java
index 877231b3b64..f0b916a2205 100644
--- a/forge-gui-mobile/src/forge/adventure/scene/MapViewScene.java
+++ b/forge-gui-mobile/src/forge/adventure/scene/MapViewScene.java
@@ -18,9 +18,9 @@ import forge.adventure.world.WorldSave;
 public class MapViewScene extends UIScene   {
     private static MapViewScene object;
     private final ScrollPane scroll;
-    private Image img;
+    private final Image img;
     private Texture miniMapTexture;
-    private Image miniMapPlayer;
+    private final Image miniMapPlayer;
 
     public static MapViewScene instance() {
         if(object==null)
diff --git a/forge-gui-mobile/src/forge/adventure/scene/NewGameScene.java b/forge-gui-mobile/src/forge/adventure/scene/NewGameScene.java
index 5e2068a7348..3be17e947e5 100644
--- a/forge-gui-mobile/src/forge/adventure/scene/NewGameScene.java
+++ b/forge-gui-mobile/src/forge/adventure/scene/NewGameScene.java
@@ -36,16 +36,18 @@ import java.util.Random;
 public class NewGameScene extends UIScene {
     TextField selectedName;
     ColorSet[] colorIds;
-    private Image avatarImage;
+    private final Image avatarImage;
     private int avatarIndex = 0;
-    private Selector race;
-    private Selector colorId;
-    private Selector gender;
-    private Selector mode;
-    private Selector difficulty;
-    private Array<String> stringList, random, custom;
-    private TextraLabel colorLabel;
-    private int selected = -1;
+    private final Selector race;
+    private final Selector colorId;
+    private final Selector gender;
+    private final Selector mode;
+    private final Selector difficulty;
+    private final Array<String> stringList;
+    private final Array<String> random;
+    private final Array<String> custom;
+    private final TextraLabel colorLabel;
+    private final int selected = -1;
 
     private NewGameScene() {
 
diff --git a/forge-gui-mobile/src/forge/adventure/scene/RewardScene.java b/forge-gui-mobile/src/forge/adventure/scene/RewardScene.java
index 9daa397ddfb..4eae3ad3cd0 100644
--- a/forge-gui-mobile/src/forge/adventure/scene/RewardScene.java
+++ b/forge-gui-mobile/src/forge/adventure/scene/RewardScene.java
@@ -24,8 +24,8 @@ import forge.sound.SoundSystem;
  * Displays the rewards of a fight or a treasure
  */
 public class RewardScene extends UIScene {
-    private TextraButton doneButton;
-    private TextraLabel goldLabel;
+    private final TextraButton doneButton;
+    private final TextraLabel goldLabel;
 
     private static RewardScene object;
 
@@ -399,7 +399,7 @@ public class RewardScene extends UIScene {
         }
 
         public BuyButton(int id, int i, PointOfInterestChanges ch, RewardActor actor, TextraButton style) {
-            super("", style.getStyle());
+            super("", style.getStyle(),Controls.getTextraFont());
             this.objectID = id;
             this.index = i;
             this.changes = ch;
@@ -410,7 +410,7 @@ public class RewardScene extends UIScene {
             setY(actor.getY() - getHeight());
             price = CardUtil.getRewardPrice(actor.getReward());
             price *= Current.player().goldModifier();
-            setText("$ " + price);
+            setText(price+"[+Gold]");
             addListener(new ClickListener() {
                 @Override
                 public void clicked(InputEvent event, float x, float y) {
@@ -424,7 +424,7 @@ public class RewardScene extends UIScene {
                     SoundSystem.instance.play(SoundEffectType.FlipCoin, false);
 
                     updateBuyButtons();
-                    goldLabel.setText("Gold: " + String.valueOf(AdventurePlayer.current().getGold()));
+                    goldLabel.setText(AdventurePlayer.current().getGold()+"[+Gold]");
                     if(changes==null)
                         return;
                     setDisabled(true);
diff --git a/forge-gui-mobile/src/forge/adventure/scene/SaveLoadScene.java b/forge-gui-mobile/src/forge/adventure/scene/SaveLoadScene.java
index c909f622528..44c874aefd5 100644
--- a/forge-gui-mobile/src/forge/adventure/scene/SaveLoadScene.java
+++ b/forge-gui-mobile/src/forge/adventure/scene/SaveLoadScene.java
@@ -64,7 +64,6 @@ public class SaveLoadScene extends UIScene {
             diffList[c] = diff.name;
             c++;
         }
-        ;
 
         difficulty = Controls.newComboBox(diffList, null, o -> {
             //DifficultyData difficulty1 = Config.instance().getConfigData().difficulties[difficulty.getSelectedIndex()];
diff --git a/forge-gui-mobile/src/forge/adventure/scene/SettingsScene.java b/forge-gui-mobile/src/forge/adventure/scene/SettingsScene.java
index 2539e7ab43d..0a08d742717 100644
--- a/forge-gui-mobile/src/forge/adventure/scene/SettingsScene.java
+++ b/forge-gui-mobile/src/forge/adventure/scene/SettingsScene.java
@@ -23,7 +23,7 @@ public class SettingsScene extends UIScene {
     static public ForgePreferences Preference;
     Stage stage;
     Texture Background;
-    private Table settingGroup;
+    private final Table settingGroup;
     TextraButton backButton;
     ScrollPane scrollPane;
 
diff --git a/forge-gui-mobile/src/forge/adventure/scene/SpellSmithScene.java b/forge-gui-mobile/src/forge/adventure/scene/SpellSmithScene.java
index 35315a92fc2..09124f3b24a 100644
--- a/forge-gui-mobile/src/forge/adventure/scene/SpellSmithScene.java
+++ b/forge-gui-mobile/src/forge/adventure/scene/SpellSmithScene.java
@@ -38,9 +38,9 @@ public class SpellSmithScene extends UIScene {
     }
 
     private List<PaperCard> cardPool = new ArrayList<>();
-    private TextraLabel goldLabel;
-    private TextraButton pullButton;
-    private ScrollPane rewardDummy;
+    private final TextraLabel goldLabel;
+    private final TextraButton pullButton;
+    private final ScrollPane rewardDummy;
     private RewardActor rewardActor;
     SelectBox<CardEdition> editionList;
     //Button containers.
@@ -53,7 +53,7 @@ public class SpellSmithScene extends UIScene {
     private int cost_low   = -1;
     private int cost_high  = 9999;
     //Other
-    private float basePrice  = 125f;
+    private final float basePrice  = 125f;
     private int currentPrice = 0;
 
     private SpellSmithScene() { super(Forge.isLandscapeMode() ? "ui/spellsmith.json" : "ui/spellsmith_portrait.json");
diff --git a/forge-gui-mobile/src/forge/adventure/scene/TileMapScene.java b/forge-gui-mobile/src/forge/adventure/scene/TileMapScene.java
index 1187c507a63..ea224a7dbb4 100644
--- a/forge-gui-mobile/src/forge/adventure/scene/TileMapScene.java
+++ b/forge-gui-mobile/src/forge/adventure/scene/TileMapScene.java
@@ -24,7 +24,6 @@ public class TileMapScene extends HudScene   {
     PointOfInterestMapRenderer tiledMapRenderer;
     private String nextMap;
     private boolean autoheal = false;
-    private float cameraWidth = 0f, cameraHeight = 0f;
 
     private TileMapScene() {
         super(MapStage.getInstance());
@@ -32,10 +31,6 @@ public class TileMapScene extends HudScene   {
 
 
         //set initial camera width and height
-        if (cameraWidth == 0f)
-            cameraWidth = stage.getCamera().viewportWidth;
-        if (cameraHeight == 0f)
-            cameraHeight = stage.getCamera().viewportHeight;
         MapStage.getInstance().setDialogStage(hud);
     }
 
diff --git a/forge-gui-mobile/src/forge/adventure/scene/UIScene.java b/forge-gui-mobile/src/forge/adventure/scene/UIScene.java
index 05e3b6d977c..b8fa9d2a14a 100644
--- a/forge-gui-mobile/src/forge/adventure/scene/UIScene.java
+++ b/forge-gui-mobile/src/forge/adventure/scene/UIScene.java
@@ -31,9 +31,9 @@ public class UIScene extends Scene {
     Stage stage;
 
     String uiFile;
-    private Dialog keyboardDialog;
-    private Label kbLabel;
-    private TextraButton keyA, keyB, keyC, keyD, keyE, keyF, keyG, keyH, keyI, keyJ, keyK, keyL, keyM, keyN, keyO, keyP,
+    private final Dialog keyboardDialog;
+    private final Label kbLabel;
+    private final TextraButton keyA, keyB, keyC, keyD, keyE, keyF, keyG, keyH, keyI, keyJ, keyK, keyL, keyM, keyN, keyO, keyP,
             keyQ, keyR, keyS, keyT, keyU, keyV, keyW, keyX, keyY, keyZ, key1, key2, key3, key4, key5, key6, key7, key8,
             key9, key0, keyDot, keyComma, keyShift, keyBackspace, keySpace, keyOK;
     public Actor lastInputField;
diff --git a/forge-gui-mobile/src/forge/adventure/stage/Console.java b/forge-gui-mobile/src/forge/adventure/stage/Console.java
index 3407d0cfbd8..8d573d4c245 100644
--- a/forge-gui-mobile/src/forge/adventure/stage/Console.java
+++ b/forge-gui-mobile/src/forge/adventure/stage/Console.java
@@ -8,7 +8,7 @@ import forge.adventure.util.Controls;
 
 public class Console extends Window {
     private final ScrollPane scroll;
-    private String last = "";
+    private  String last = "";
     private final InputLine input;
     private final Table content;
 
@@ -22,8 +22,8 @@ public class Console extends Window {
         }
     }
 
-    class InputLine extends TextField {
-        private Console console;
+    static class InputLine extends TextField {
+        private final Console console;
 
         public InputLine(Console console) {
             super("", Controls.getSkin());
@@ -43,8 +43,15 @@ public class Console extends Window {
                     case BACKSPACE:
                         break;
                     case TAB:
-                        self.setText(console.complete(self.getText()));
-                        self.setCursorPosition(Integer.MAX_VALUE);
+                        if(self.getText().isEmpty())
+                        {
+                            self.setText(console.last);
+                        }
+                        else
+                        {
+                            self.setText(console.complete(self.getText()));
+                            self.setCursorPosition(Integer.MAX_VALUE);
+                        }
                         break;
                     case NEWLINE:
                     case CARRIAGE_RETURN:
diff --git a/forge-gui-mobile/src/forge/adventure/stage/ConsoleCommandInterpreter.java b/forge-gui-mobile/src/forge/adventure/stage/ConsoleCommandInterpreter.java
index 86116073ae2..ce475e62dd8 100644
--- a/forge-gui-mobile/src/forge/adventure/stage/ConsoleCommandInterpreter.java
+++ b/forge-gui-mobile/src/forge/adventure/stage/ConsoleCommandInterpreter.java
@@ -28,7 +28,7 @@ public class ConsoleCommandInterpreter {
     private static ConsoleCommandInterpreter instance;
     Command root = new Command();
 
-    class Command {
+    static class Command {
         HashMap<String, Command> children = new HashMap<>();
         Function<String[], String> function;
     }
@@ -93,7 +93,7 @@ public class ConsoleCommandInterpreter {
 
         for(String name:path) {
             if(!currentCommand.children.containsKey(name))
-                currentCommand.children.put(name,new Command());
+                currentCommand.children.put(name, new Command());
             currentCommand = currentCommand.children.get(name);
         }
         currentCommand.function = function;
diff --git a/forge-gui-mobile/src/forge/adventure/stage/GameHUD.java b/forge-gui-mobile/src/forge/adventure/stage/GameHUD.java
index 84a7cf5d0ed..9789261bf7e 100644
--- a/forge-gui-mobile/src/forge/adventure/stage/GameHUD.java
+++ b/forge-gui-mobile/src/forge/adventure/stage/GameHUD.java
@@ -50,10 +50,13 @@ public class GameHUD extends Stage implements ControllerListener {
     private final Image miniMap, gamehud, mapborder, avatarborder, blank;
     private final InputEvent eventTouchDown;
     private final InputEvent eventTouchUp;
-    private TextraButton deckActor, menuActor, statsActor, inventoryActor;
-    private UIActor ui;
-    private Touchpad touchpad;
-    private Console console;
+    private final TextraButton deckActor;
+    private final TextraButton menuActor;
+    private final TextraButton statsActor;
+    private final TextraButton inventoryActor;
+    private final UIActor ui;
+    private final Touchpad touchpad;
+    private final Console console;
     float TOUCHPAD_SCALE = 70f, referenceX;
     boolean isHiding = false, isShowing = false;
     float opacity = 1f;
diff --git a/forge-gui-mobile/src/forge/adventure/stage/GameStage.java b/forge-gui-mobile/src/forge/adventure/stage/GameStage.java
index 29adffc300d..f080e95957b 100644
--- a/forge-gui-mobile/src/forge/adventure/stage/GameStage.java
+++ b/forge-gui-mobile/src/forge/adventure/stage/GameStage.java
@@ -256,9 +256,12 @@ public abstract class GameStage extends Stage {
         if (keycode == Input.Keys.F2) {
             TileMapScene S = TileMapScene.instance();
             PointOfInterestData P = PointOfInterestData.getPointOfInterest("DEBUGZONE");
-            PointOfInterest PoI = new PointOfInterest(P,new Vector2(0,0), MyRandom.getRandom());
-            S.load(PoI);
-            Forge.switchScene(S);
+            if( P != null)
+            {
+                PointOfInterest PoI = new PointOfInterest(P,new Vector2(0,0), MyRandom.getRandom());
+                S.load(PoI);
+                Forge.switchScene(S);
+            }
         }
         if (keycode == Input.Keys.F11) {
             debugCollision(false);
diff --git a/forge-gui-mobile/src/forge/adventure/stage/IAfterMatch.java b/forge-gui-mobile/src/forge/adventure/stage/IAfterMatch.java
index 419f0c175a9..08494e82760 100644
--- a/forge-gui-mobile/src/forge/adventure/stage/IAfterMatch.java
+++ b/forge-gui-mobile/src/forge/adventure/stage/IAfterMatch.java
@@ -1,5 +1,5 @@
 package forge.adventure.stage;
 
 public interface IAfterMatch {
-    public void setWinner(boolean winner);
+    void setWinner(boolean winner);
 }
diff --git a/forge-gui-mobile/src/forge/adventure/stage/MapStage.java b/forge-gui-mobile/src/forge/adventure/stage/MapStage.java
index ac01c589f22..bfb22235abd 100644
--- a/forge-gui-mobile/src/forge/adventure/stage/MapStage.java
+++ b/forge-gui-mobile/src/forge/adventure/stage/MapStage.java
@@ -54,10 +54,6 @@ public class MapStage extends GameStage {
 
     TiledMap map;
     Array<Rectangle> collisionRect=new Array<>();
-    private float tileHeight;
-    private float tileWidth;
-    private float width;
-    private float height;
     private boolean isInMap = false;
     MapLayer spriteLayer;
     private PointOfInterestChanges changes;
@@ -93,7 +89,7 @@ public class MapStage extends GameStage {
     }
 
     public boolean canEscape() {
-        return (preventEscape ? true : false);
+        return !preventEscape;
     } //Check if escape is possible.
 
     public void clearIsInMap() {
@@ -266,10 +262,10 @@ public class MapStage extends GameStage {
 
         actors.clear();
         collisionRect.clear();
-        width = Float.parseFloat(map.getProperties().get("width").toString());
-        height = Float.parseFloat(map.getProperties().get("height").toString());
-        tileHeight = Float.parseFloat(map.getProperties().get("tileheight").toString());
-        tileWidth = Float.parseFloat(map.getProperties().get("tilewidth").toString());
+        float width = Float.parseFloat(map.getProperties().get("width").toString());
+        float height = Float.parseFloat(map.getProperties().get("height").toString());
+        float tileHeight = Float.parseFloat(map.getProperties().get("tileheight").toString());
+        float tileWidth = Float.parseFloat(map.getProperties().get("tilewidth").toString());
         setBounds(width * tileWidth, height * tileHeight);
         //collision = new Array[(int) width][(int) height];
 
diff --git a/forge-gui-mobile/src/forge/adventure/stage/PointOfInterestMapRenderer.java b/forge-gui-mobile/src/forge/adventure/stage/PointOfInterestMapRenderer.java
index 6124e533df3..fa072d97c5a 100644
--- a/forge-gui-mobile/src/forge/adventure/stage/PointOfInterestMapRenderer.java
+++ b/forge-gui-mobile/src/forge/adventure/stage/PointOfInterestMapRenderer.java
@@ -1,7 +1,6 @@
 package forge.adventure.stage;
 
 import com.badlogic.gdx.graphics.Camera;
-import com.badlogic.gdx.graphics.g2d.Batch;
 import com.badlogic.gdx.maps.MapLayer;
 import com.badlogic.gdx.maps.tiled.TiledMap;
 import com.badlogic.gdx.maps.tiled.renderers.OrthogonalTiledMapRenderer;
diff --git a/forge-gui-mobile/src/forge/adventure/stage/WorldStage.java b/forge-gui-mobile/src/forge/adventure/stage/WorldStage.java
index d8aba9dc97e..ed31af4adb8 100644
--- a/forge-gui-mobile/src/forge/adventure/stage/WorldStage.java
+++ b/forge-gui-mobile/src/forge/adventure/stage/WorldStage.java
@@ -46,10 +46,10 @@ public class WorldStage extends GameStage implements SaveFileContent {
     protected Random rand = MyRandom.getRandom();
     WorldBackground background;
     private float spawnDelay = 0;
-    private final float spawnInterval = 4;//todo config
+    private static final float spawnInterval = 4;//todo config
     private PointOfInterestMapSprite collidingPoint;
     protected ArrayList<Pair<Float, EnemySprite>> enemies = new ArrayList<>();
-    private final Float dieTimer=20f;//todo config
+    private final static Float dieTimer=20f;//todo config
     private Float globalTimer=0f;
 
     public WorldStage() {
diff --git a/forge-gui-mobile/src/forge/adventure/util/Controls.java b/forge-gui-mobile/src/forge/adventure/util/Controls.java
index 966fdcc0d92..1fb6f3cc08e 100644
--- a/forge-gui-mobile/src/forge/adventure/util/Controls.java
+++ b/forge-gui-mobile/src/forge/adventure/util/Controls.java
@@ -273,7 +273,7 @@ public class Controls {
             return Color.PURPLE;
         if(upperCase.equals("VIOLET"))
             return Color.VIOLET;
-        if(upperCase.equals("PINK"))
+        if(upperCase.equals("MAROON"))
             return Color.MAROON;
         return Color.BLACK;
     }
diff --git a/forge-gui-mobile/src/forge/adventure/util/MapDialog.java b/forge-gui-mobile/src/forge/adventure/util/MapDialog.java
index ed975ee8a69..6d2ad5eb4dc 100644
--- a/forge-gui-mobile/src/forge/adventure/util/MapDialog.java
+++ b/forge-gui-mobile/src/forge/adventure/util/MapDialog.java
@@ -19,9 +19,9 @@ import forge.util.Localizer;
 
 public class MapDialog {
     private final MapStage stage;
-    private Array<DialogData> data;
+    private final Array<DialogData> data;
     private final int parentID;
-    private final float WIDTH = 260f;
+    private final static float WIDTH = 260f;
     static private final String defaultJSON = "[\n" +
             "  {\n" +
             "    \"effect\":[],\n" +
diff --git a/forge-gui-mobile/src/forge/adventure/util/RewardActor.java b/forge-gui-mobile/src/forge/adventure/util/RewardActor.java
index 591bf371bef..ffe0c05134c 100644
--- a/forge-gui-mobile/src/forge/adventure/util/RewardActor.java
+++ b/forge-gui-mobile/src/forge/adventure/util/RewardActor.java
@@ -115,17 +115,17 @@ public class RewardActor extends Actor implements Disposable, ImageFetcher.Callb
             if (toolTipImage.getDrawable() instanceof TextureRegionDrawable) {
                 ((TextureRegionDrawable) toolTipImage.getDrawable()).getRegion().getTexture().dispose();
             }
-        }
-        toolTipImage.remove();
-        toolTipImage = new Image(processDrawable(image));
-        if (GuiBase.isAndroid()||Forge.hasGamepad()) {
-            if (holdTooltip.tooltip_image.getDrawable() instanceof TextureRegionDrawable) {
-                ((TextureRegionDrawable) holdTooltip.tooltip_image.getDrawable()).getRegion().getTexture().dispose();
+            toolTipImage.remove();
+            toolTipImage = new Image(processDrawable(image));
+            if (GuiBase.isAndroid()||Forge.hasGamepad()) {
+                if (holdTooltip.tooltip_image.getDrawable() instanceof TextureRegionDrawable) {
+                    ((TextureRegionDrawable) holdTooltip.tooltip_image.getDrawable()).getRegion().getTexture().dispose();
+                }
+                holdTooltip.tooltip_actor.clear();
+                holdTooltip.tooltip_actor.add(toolTipImage);
+            } else {
+                tooltip.setActor(toolTipImage);
             }
-            holdTooltip.tooltip_actor.clear();
-            holdTooltip.tooltip_actor.add(toolTipImage);
-        } else {
-            tooltip.setActor(toolTipImage);
         }
         if (T != null)
             T.dispose();
@@ -721,8 +721,7 @@ public class RewardActor extends Actor implements Disposable, ImageFetcher.Callb
                 tooltip_actor.setX(Scene.getIntendedWidth() / 2 - tooltip_actor.getWidth() / 2);
             }
             tooltip_actor.setY(Scene.getIntendedHeight() / 2 - tooltip_actor.getHeight() / 2);
-            //tooltip_actor.setX(480/2 - tooltip_actor.getWidth()/2); //480 hud width
-            //tooltip_actor.setY(270/2-tooltip_actor.getHeight()/2); //270 hud height
+
             actor.getStage().addActor(tooltip_actor);
             return super.longPress(actor, x, y);
         }
diff --git a/forge-gui-mobile/src/forge/adventure/util/SaveFileData.java b/forge-gui-mobile/src/forge/adventure/util/SaveFileData.java
index ed35e696620..bfb39b1dc67 100644
--- a/forge-gui-mobile/src/forge/adventure/util/SaveFileData.java
+++ b/forge-gui-mobile/src/forge/adventure/util/SaveFileData.java
@@ -162,7 +162,7 @@ public class SaveFileData extends HashMap<String,byte[]>
         try {
 
             ByteArrayInputStream stream=new ByteArrayInputStream(get(key));
-            ObjectInputStream objStream=new DecompressibleInputStream(stream);
+            ObjectInputStream objStream= new DecompressibleInputStream(stream);
             return (SaveFileData)objStream.readObject();
 
         } catch (IOException | ClassNotFoundException e) {
@@ -177,7 +177,7 @@ public class SaveFileData extends HashMap<String,byte[]>
         try {
 
             ByteArrayInputStream stream=new ByteArrayInputStream(get(key));
-            ObjectInputStream objStream=new DecompressibleInputStream(stream);
+            ObjectInputStream objStream= new DecompressibleInputStream(stream);
             return objStream.readObject();
 
         } catch (IOException | ClassNotFoundException e) {
@@ -193,7 +193,7 @@ public class SaveFileData extends HashMap<String,byte[]>
         try {
 
             ByteArrayInputStream stream=new ByteArrayInputStream(get(key));
-            ObjectInputStream objStream=new DecompressibleInputStream(stream);
+            ObjectInputStream objStream= new DecompressibleInputStream(stream);
             return objStream.readUTF();
 
         } catch (IOException e) {
@@ -208,7 +208,7 @@ public class SaveFileData extends HashMap<String,byte[]>
         try {
 
             ByteArrayInputStream stream=new ByteArrayInputStream(get(key));
-            ObjectInputStream objStream=new DecompressibleInputStream(stream);
+            ObjectInputStream objStream= new DecompressibleInputStream(stream);
             return objStream.readLong();
 
         } catch (IOException e) {
@@ -223,7 +223,7 @@ public class SaveFileData extends HashMap<String,byte[]>
         try {
 
             ByteArrayInputStream stream=new ByteArrayInputStream(get(key));
-            ObjectInputStream objStream=new DecompressibleInputStream(stream);
+            ObjectInputStream objStream= new DecompressibleInputStream(stream);
             return objStream.readFloat();
 
         } catch (IOException e) {
@@ -239,7 +239,7 @@ public class SaveFileData extends HashMap<String,byte[]>
         try {
 
             ByteArrayInputStream stream=new ByteArrayInputStream(get(key));
-            ObjectInputStream objStream=new DecompressibleInputStream(stream);
+            ObjectInputStream objStream= new DecompressibleInputStream(stream);
             return objStream.readDouble();
 
         } catch (IOException e) {
@@ -254,7 +254,7 @@ public class SaveFileData extends HashMap<String,byte[]>
         try {
 
             ByteArrayInputStream stream=new ByteArrayInputStream(get(key));
-            ObjectInputStream objStream=new DecompressibleInputStream(stream);
+            ObjectInputStream objStream= new DecompressibleInputStream(stream);
             float x= objStream.readFloat();
             float y= objStream.readFloat();
             return new Vector2(x,y);
@@ -271,7 +271,7 @@ public class SaveFileData extends HashMap<String,byte[]>
         try {
 
             ByteArrayInputStream stream=new ByteArrayInputStream(get(key));
-            ObjectInputStream objStream=new DecompressibleInputStream(stream);
+            ObjectInputStream objStream= new DecompressibleInputStream(stream);
             float x= objStream.readFloat();
             float y= objStream.readFloat();
             float width= objStream.readFloat();
@@ -299,7 +299,7 @@ public class SaveFileData extends HashMap<String,byte[]>
         try {
 
             ByteArrayInputStream stream=new ByteArrayInputStream(get(key));
-            ObjectInputStream objStream=new DecompressibleInputStream(stream);
+            ObjectInputStream objStream= new DecompressibleInputStream(stream);
             return objStream.readInt();
 
         } catch (IOException e) {
@@ -314,7 +314,7 @@ public class SaveFileData extends HashMap<String,byte[]>
         try {
 
             ByteArrayInputStream stream=new ByteArrayInputStream(get(key));
-            ObjectInputStream objStream=new DecompressibleInputStream(stream);
+            ObjectInputStream objStream= new DecompressibleInputStream(stream);
             return objStream.readBoolean();
 
         } catch (IOException e) {
@@ -326,7 +326,7 @@ public class SaveFileData extends HashMap<String,byte[]>
 
 
 
-    class DecompressibleInputStream extends ObjectInputStream {
+    static class DecompressibleInputStream extends ObjectInputStream {
 
         /*https://stackoverflow.com/questions/1816559/make-java-runtime-ignore-serialversionuids*/
 
@@ -355,8 +355,7 @@ public class SaveFileData extends HashMap<String,byte[]>
                     final StringBuffer s = new StringBuffer("Overriding serialized class version mismatch: ");
                     s.append("local serialVersionUID = ").append(localSUID);
                     s.append(" stream serialVersionUID = ").append(streamSUID);
-                    //Exception e = new InvalidClassException(s.toString());
-                    //logger.error("Potentially Fatal Deserialization Operation.", e);
+
                     System.err.println("[Invalid Class Exception]\n"+s);
                     resultClassDescriptor = localClassDescriptor; // Use local class descriptor for deserialization
                 }
diff --git a/forge-gui-mobile/src/forge/adventure/world/BiomeSprites.java b/forge-gui-mobile/src/forge/adventure/world/BiomeSprites.java
index 004184c3520..5a307b99e6b 100644
--- a/forge-gui-mobile/src/forge/adventure/world/BiomeSprites.java
+++ b/forge-gui-mobile/src/forge/adventure/world/BiomeSprites.java
@@ -20,9 +20,6 @@ public class BiomeSprites {
     public Sprite getSprite(String name, int seed) {
         if (textureAtlasBuffer == null) {
             textureAtlasBuffer = Config.instance().getAtlas(textureAtlas);
-            /*for (Texture texture : new  ObjectSet.ObjectSetIterator<>(textureAtlasBuffer.getTextures())) {
-                texture.setFilter(Texture.TextureFilter.Nearest, Texture.TextureFilter.Nearest);
-            }*/
         }
         if (!spriteBuffer.containsKey(name)) {
             spriteBuffer.put(name, new Array<Sprite>());
diff --git a/forge-gui-mobile/src/forge/adventure/world/BiomeStructure.java b/forge-gui-mobile/src/forge/adventure/world/BiomeStructure.java
index 00c9760ea80..717cc9509f0 100644
--- a/forge-gui-mobile/src/forge/adventure/world/BiomeStructure.java
+++ b/forge-gui-mobile/src/forge/adventure/world/BiomeStructure.java
@@ -9,12 +9,12 @@ import java.util.HashMap;
 
 public class BiomeStructure {
 
-    private BiomeStructureData data;
-    long seed;
-    private int biomeWidth;
-    private int biomeHeight;
-    private int dataMap[][];
-    private boolean collisionMap[][];
+    private final BiomeStructureData data;
+    final long seed;
+    private final int biomeWidth;
+    private final int biomeHeight;
+    private int[][] dataMap;
+    private boolean[][] collisionMap;
     boolean init=false;
     private TextureAtlas structureAtlas;
     public ColorMap image;
@@ -61,7 +61,7 @@ public class BiomeStructure {
 
         init=true;
         int targetWidth=(int) (data.width* biomeWidth);
-        int targetHeight=(int) (data.width* biomeWidth);
+        int targetHeight=(int) (data.height* biomeHeight);
         dataMap=new int[targetWidth][  targetHeight];
         collisionMap=new boolean[targetWidth][ targetHeight];
         ColorMap finalImage=new ColorMap(targetWidth, targetHeight);
diff --git a/forge-gui-mobile/src/forge/adventure/world/BiomeTexture.java b/forge-gui-mobile/src/forge/adventure/world/BiomeTexture.java
index 0d70344d34d..498b5d65064 100644
--- a/forge-gui-mobile/src/forge/adventure/world/BiomeTexture.java
+++ b/forge-gui-mobile/src/forge/adventure/world/BiomeTexture.java
@@ -121,7 +121,7 @@ public class BiomeTexture implements Serializable {
                     ArrayList<Pixmap> spics = new ArrayList<>();
                     if(!region.getTexture().getTextureData().isPrepared())
                         region.getTexture().getTextureData().prepare();
-                        Pixmap completePicture = region.getTexture().getTextureData().consumePixmap();
+                    Pixmap completePicture = region.getTexture().getTextureData().consumePixmap();
                     for (int y = 0; y < 4; y++) {
                         for (int x = 0; x < 3; x++) {
                             int px = region.getRegionX() + (x * tileSize);
@@ -285,6 +285,7 @@ public class BiomeTexture implements Serializable {
                 }
             }
         }
+        //noinspection ConstantConditions
         if (false)//debug neighbors
         {
             subPixmap.setColor(Color.GREEN);
@@ -340,7 +341,7 @@ public class BiomeTexture implements Serializable {
         BottomEdge(10),
         RightBottomEdge(11);
 
-        public int value;
+        public final int value;
 
         BigPictures(int i) {
             value = i;
@@ -398,7 +399,7 @@ public class BiomeTexture implements Serializable {
         RightBottomEdge01(46),
         RightBottomEdge11(47);
 
-        public int value;
+        public final int value;
 
         SmallPictures(int i) {
             value = i;
diff --git a/forge-gui-mobile/src/forge/adventure/world/OverlappingModel.java b/forge-gui-mobile/src/forge/adventure/world/OverlappingModel.java
index de18632dfa3..8604c1b175f 100644
--- a/forge-gui-mobile/src/forge/adventure/world/OverlappingModel.java
+++ b/forge-gui-mobile/src/forge/adventure/world/OverlappingModel.java
@@ -17,7 +17,7 @@ public class OverlappingModel extends Model {
 
   @FunctionalInterface
   interface Agrees<One, Two, Three, Four, Five> {
-    public Five apply(One one, Two two, Three three, Four four);
+    Five apply(One one, Two two, Three three, Four four);
   }
 
   /**
@@ -51,10 +51,10 @@ public class OverlappingModel extends Model {
 
     this.colors = new ArrayList<Color>();
 
-    for (int y = 0; y < SMY; y++) for (int x = 0; x < SMX; x++) {
-      Color color = data.getColor(x, y);
-    if(color==null)
-      break;
+      for (int y = 0; y < SMY; y++) for (int x = 0; x < SMX; x++) {
+        Color color = data.getColor(x, y);
+      if(color==null)
+        break;
       int i = 0;
       for (Color c : colors) {
         if (c.equals(color)) break;
diff --git a/forge-gui-mobile/src/forge/adventure/world/SpritesDataMap.java b/forge-gui-mobile/src/forge/adventure/world/SpritesDataMap.java
index bb38fa44f34..8caab7fc499 100644
--- a/forge-gui-mobile/src/forge/adventure/world/SpritesDataMap.java
+++ b/forge-gui-mobile/src/forge/adventure/world/SpritesDataMap.java
@@ -14,7 +14,7 @@ import java.util.List;
  * Class that hold all sprites as a list for each chunk
  */
 public class SpritesDataMap implements SaveFileContent {
-    public class BiomeSpriteDataMap extends HashMap<Integer, BiomeSpriteData> implements SaveFileContent
+    public static class BiomeSpriteDataMap extends HashMap<Integer, BiomeSpriteData> implements SaveFileContent
     {
         @Override
         public void load(SaveFileData data) {
diff --git a/forge-gui-mobile/src/forge/adventure/world/World.java b/forge-gui-mobile/src/forge/adventure/world/World.java
index 6afb79eed3c..4f611811f76 100644
--- a/forge-gui-mobile/src/forge/adventure/world/World.java
+++ b/forge-gui-mobile/src/forge/adventure/world/World.java
@@ -140,7 +140,7 @@ public class World implements Disposable, SaveFileContent {
         return mapObjectIds.get(id);
     }
 
-    private class DrawingInformation {
+    private static class DrawingInformation {
 
         private int neighbors;
         private final BiomeTexture regions;
@@ -407,8 +407,7 @@ public class World implements Disposable, SaveFileContent {
 
                                     int structureIndex = structure.objectID(structureXStart, structureYStart);
                                     if (structureIndex >= 0) {
-                                        //pix.setColor(data.mappingInfo[structureIndex].getColor());
-                                        //pix.fillRectangle(x*data.miniMapTileSize, y*data.miniMapTileSize,data.miniMapTileSize,data.miniMapTileSize);
+
                                         terrainMap[x][y] = terrainCounter + structureIndex;
                                         if (structure.collision(structureXStart, structureYStart))
                                             terrainMap[x][y] |= collisionBit;
@@ -804,7 +803,7 @@ public class World implements Disposable, SaveFileContent {
 
     }
 
-    class DrawInfo
+    static class DrawInfo
     {
         Pixmap mapMarkerPixmap;
         int regionX;
@@ -818,7 +817,7 @@ public class World implements Disposable, SaveFileContent {
     }
     final Array<DrawInfo> storedInfo=new Array<>();
     private void drawPixmapLater(Pixmap mapMarkerPixmap, int regionX, int regionY, int regionWidth, int regionHeight, int x, int y, int regionWidth1, int regionHeight1) {
-        DrawInfo info=new DrawInfo();
+        DrawInfo info= new DrawInfo();
         info.mapMarkerPixmap=mapMarkerPixmap;
         info.regionX=regionX;
         info.regionY=regionY;
diff --git a/local.properties b/local.properties
new file mode 100644
index 00000000000..6d73a8a2cb7
--- /dev/null
+++ b/local.properties
@@ -0,0 +1,8 @@
+## This file must *NOT* be checked into Version Control Systems,
+# as it contains information specific to your local configuration.
+#
+# Location of the SDK. This is only used by Gradle.
+# For customization when using a Version Control System, please read the
+# header note.
+#Sun Sep 18 16:22:42 CEST 2022
+sdk.dir=H\:\\Develop\\Android\\sdk\\current