diff --git a/AndorsTrail/AndroidManifest.xml b/AndorsTrail/AndroidManifest.xml
index 012681c15..1ccdb1b38 100644
--- a/AndorsTrail/AndroidManifest.xml
+++ b/AndorsTrail/AndroidManifest.xml
@@ -4,7 +4,7 @@
 	xmlns:android="http://schemas.android.com/apk/res/android" 
 	package="com.gpl.rpg.AndorsTrail_beta1"
 	android:versionCode="64"
-	android:versionName="0.7.17dev"
+	android:versionName="0.7.17beta"
 	android:installLocation="auto"
 	>
 	<uses-sdk 
diff --git a/AndorsTrail/assets/translation/ar.mo b/AndorsTrail/assets/translation/ar.mo
index 179098aea..05c884a45 100644
Binary files a/AndorsTrail/assets/translation/ar.mo and b/AndorsTrail/assets/translation/ar.mo differ
diff --git a/AndorsTrail/assets/translation/ca.mo b/AndorsTrail/assets/translation/ca.mo
index 5d2827b5c..c8e33cc84 100644
Binary files a/AndorsTrail/assets/translation/ca.mo and b/AndorsTrail/assets/translation/ca.mo differ
diff --git a/AndorsTrail/assets/translation/cs.mo b/AndorsTrail/assets/translation/cs.mo
index 662183787..d146239f9 100644
Binary files a/AndorsTrail/assets/translation/cs.mo and b/AndorsTrail/assets/translation/cs.mo differ
diff --git a/AndorsTrail/assets/translation/de.mo b/AndorsTrail/assets/translation/de.mo
index c62338044..336d76e62 100644
Binary files a/AndorsTrail/assets/translation/de.mo and b/AndorsTrail/assets/translation/de.mo differ
diff --git a/AndorsTrail/assets/translation/es.mo b/AndorsTrail/assets/translation/es.mo
index a626af191..3e0fc4aa0 100644
Binary files a/AndorsTrail/assets/translation/es.mo and b/AndorsTrail/assets/translation/es.mo differ
diff --git a/AndorsTrail/assets/translation/fr.mo b/AndorsTrail/assets/translation/fr.mo
index 14a7531b1..1b052cb28 100644
Binary files a/AndorsTrail/assets/translation/fr.mo and b/AndorsTrail/assets/translation/fr.mo differ
diff --git a/AndorsTrail/assets/translation/he.mo b/AndorsTrail/assets/translation/he.mo
index 72c900a3c..b698a24c4 100644
Binary files a/AndorsTrail/assets/translation/he.mo and b/AndorsTrail/assets/translation/he.mo differ
diff --git a/AndorsTrail/assets/translation/id.mo b/AndorsTrail/assets/translation/id.mo
index 73c65688c..dc4b693bc 100644
Binary files a/AndorsTrail/assets/translation/id.mo and b/AndorsTrail/assets/translation/id.mo differ
diff --git a/AndorsTrail/assets/translation/it.mo b/AndorsTrail/assets/translation/it.mo
index 6f14d31c0..c723fd3e4 100644
Binary files a/AndorsTrail/assets/translation/it.mo and b/AndorsTrail/assets/translation/it.mo differ
diff --git a/AndorsTrail/assets/translation/ja.mo b/AndorsTrail/assets/translation/ja.mo
index 3d1b0caad..31d31397a 100644
Binary files a/AndorsTrail/assets/translation/ja.mo and b/AndorsTrail/assets/translation/ja.mo differ
diff --git a/AndorsTrail/assets/translation/ko.mo b/AndorsTrail/assets/translation/ko.mo
index f46267331..84bfaa0aa 100644
Binary files a/AndorsTrail/assets/translation/ko.mo and b/AndorsTrail/assets/translation/ko.mo differ
diff --git a/AndorsTrail/assets/translation/nl.mo b/AndorsTrail/assets/translation/nl.mo
index a9ae29055..6a3a4e6a8 100644
Binary files a/AndorsTrail/assets/translation/nl.mo and b/AndorsTrail/assets/translation/nl.mo differ
diff --git a/AndorsTrail/assets/translation/pl.mo b/AndorsTrail/assets/translation/pl.mo
index ae9fa2e2c..bf9920db2 100644
Binary files a/AndorsTrail/assets/translation/pl.mo and b/AndorsTrail/assets/translation/pl.mo differ
diff --git a/AndorsTrail/assets/translation/pt.mo b/AndorsTrail/assets/translation/pt.mo
index 3a4fad589..5cf88f2e0 100644
Binary files a/AndorsTrail/assets/translation/pt.mo and b/AndorsTrail/assets/translation/pt.mo differ
diff --git a/AndorsTrail/assets/translation/pt_BR.mo b/AndorsTrail/assets/translation/pt_BR.mo
index 8c48f7b7e..81c1bb566 100644
Binary files a/AndorsTrail/assets/translation/pt_BR.mo and b/AndorsTrail/assets/translation/pt_BR.mo differ
diff --git a/AndorsTrail/assets/translation/ru.mo b/AndorsTrail/assets/translation/ru.mo
index 44b65ffcb..8ac9f37d8 100644
Binary files a/AndorsTrail/assets/translation/ru.mo and b/AndorsTrail/assets/translation/ru.mo differ
diff --git a/AndorsTrail/assets/translation/sv.mo b/AndorsTrail/assets/translation/sv.mo
index 98a1ba703..e4f33086a 100644
Binary files a/AndorsTrail/assets/translation/sv.mo and b/AndorsTrail/assets/translation/sv.mo differ
diff --git a/AndorsTrail/assets/translation/tr.mo b/AndorsTrail/assets/translation/tr.mo
index 0ae425786..127cae3ae 100644
Binary files a/AndorsTrail/assets/translation/tr.mo and b/AndorsTrail/assets/translation/tr.mo differ
diff --git a/AndorsTrail/assets/translation/uk.mo b/AndorsTrail/assets/translation/uk.mo
index e96747e07..a9765122a 100644
Binary files a/AndorsTrail/assets/translation/uk.mo and b/AndorsTrail/assets/translation/uk.mo differ
diff --git a/AndorsTrail/assets/translation/zh_CN.mo b/AndorsTrail/assets/translation/zh_CN.mo
index 38429f7a2..67f4b05e4 100644
Binary files a/AndorsTrail/assets/translation/zh_CN.mo and b/AndorsTrail/assets/translation/zh_CN.mo differ
diff --git a/AndorsTrail/assets/translation/zh_TW.mo b/AndorsTrail/assets/translation/zh_TW.mo
index 593bffaa2..1bd37bb55 100644
Binary files a/AndorsTrail/assets/translation/zh_TW.mo and b/AndorsTrail/assets/translation/zh_TW.mo differ
diff --git a/AndorsTrail/res/raw/conversationlist_fungi_panic.json b/AndorsTrail/res/raw/conversationlist_fungi_panic.json
index 9823d7455..f82864646 100644
--- a/AndorsTrail/res/raw/conversationlist_fungi_panic.json
+++ b/AndorsTrail/res/raw/conversationlist_fungi_panic.json
@@ -2702,7 +2702,7 @@
     },
     {
         "id":"chk_wild_berry_50",
-        "message":"I should better wear my gloves again."
+        "message":"I should wear my gloves again."
     },
     {
         "id":"chk_wild_berry1",
diff --git a/AndorsTrail/res/raw/conversationlist_omi2.json b/AndorsTrail/res/raw/conversationlist_omi2.json
index 2c901538a..fa7fcc9ba 100644
--- a/AndorsTrail/res/raw/conversationlist_omi2.json
+++ b/AndorsTrail/res/raw/conversationlist_omi2.json
@@ -2555,7 +2555,7 @@
     },
     {
         "id":"ehrenfest_23",
-        "message":"Lorn lay next to me, just a few meters away. His armor was entirely covered in blood, flowing slowly to the ground out of his body.",
+        "message":"Lorn lay next to me, just a few steps away. His armor was entirely covered in blood, flowing slowly to the ground out of his body.",
         "replies":[
             {
                 "text":"What about the campfire?",
@@ -2856,7 +2856,7 @@
         "message":"I'm afraid not.",
         "replies":[
             {
-                "text":"Ok, we'll talk later.",
+                "text":"OK, we'll talk later.",
                 "nextPhraseID":"X"
             }
         ]
@@ -4327,7 +4327,7 @@
                 "nextPhraseID":"X"
             },
             {
-                "text":"Ok, I will help you. Let's solve this once for all.",
+                "text":"OK, I will help you. Let's solve this once for all.",
                 "nextPhraseID":"ehrenfest_39b",
                 "requires":[
                     {
@@ -5427,7 +5427,7 @@
     },
     {
         "id":"ortholion_subdued_2",
-        "message":"The scout stares at you with an inconmensurable anger. Before you can react, she swings her dagger, opening a wound in your arm.",
+        "message":"The scout stares at you with an immeasurable anger. Before you can react, she swings her dagger, opening a wound in your arm.",
         "switchToNPC":"none",
         "replies":[
             {
@@ -6610,7 +6610,7 @@
     },
     {
         "id":"elm3_corpse_3a",
-        "message":"Everything seems too old and stinky to be worth a penny, but after half a minute of searching you see a strange pendant behind the miner's shirt.",
+        "message":"Everything seems too old and stinky to be worth anything much, but after half a minute of searching you see a strange pendant behind the miner's shirt.",
         "replies":[
             {
                 "text":"I need to take a bath.",
@@ -9130,7 +9130,7 @@
     },
     {
         "id":"ortholion_16a",
-        "message":"A reward? This does not work that way...What would Feygard would think of my assassination? Who would be blamed for that?\n\nThe reward is I'm alive and no army will chase you.",
+        "message":"A reward? This does not work that way...What would Feygard think of my assassination? Who would be blamed for that?\n\nThe reward is I'm alive and no army will chase you.",
         "replies":[
             {
                 "text":"*laughing* Do you think a few drunkards could beat me?",
diff --git a/AndorsTrail/res/raw/droplists_omi2.json b/AndorsTrail/res/raw/droplists_omi2.json
index d8a7333f2..9e8209d05 100644
--- a/AndorsTrail/res/raw/droplists_omi2.json
+++ b/AndorsTrail/res/raw/droplists_omi2.json
@@ -1636,7 +1636,7 @@
                 }
             },
             {
-               "itemID":"health_major2",
+                "itemID":"health_major2",
                 "chance":"1/8",
                 "quantity":{
                     "min":1,
@@ -1734,13 +1734,13 @@
                 "itemID":"gold",
                 "chance":"100",
                 "quantity":{
-                    "min":12,
-                    "max":62
+                    "min":3,
+                    "max":9
                 }
             },
             {
                 "itemID":"kamelio_drop1",
-                "chance":"1/4",
+                "chance":"100",
                 "quantity":{
                     "min":1,
                     "max":1
@@ -1748,7 +1748,7 @@
             },
             {
                 "itemID":"kamelio_drop2",
-                "chance":"1/4",
+                "chance":"100",
                 "quantity":{
                     "min":1,
                     "max":1
@@ -1756,7 +1756,7 @@
             },
             {
                 "itemID":"kamelio_drop3",
-                "chance":"1/4",
+                "chance":"100",
                 "quantity":{
                     "min":1,
                     "max":1
diff --git a/AndorsTrail/res/raw/itemlist_v0611_1.json b/AndorsTrail/res/raw/itemlist_v0611_1.json
index 6bd91a96d..8cd2bef87 100644
--- a/AndorsTrail/res/raw/itemlist_v0611_1.json
+++ b/AndorsTrail/res/raw/itemlist_v0611_1.json
@@ -283,7 +283,7 @@
         "category":"hnd_lthr",
         "equipEffect":{
             "increaseAttackChance":-3,
-            "increaseBlockChance":7,
+            "increaseBlockChance":8,
             "increaseDamageResistance":1
         }
     },
diff --git a/AndorsTrail/res/raw/questlist_omi2.json b/AndorsTrail/res/raw/questlist_omi2.json
index 541c193c9..6a7227e5a 100644
--- a/AndorsTrail/res/raw/questlist_omi2.json
+++ b/AndorsTrail/res/raw/questlist_omi2.json
@@ -349,7 +349,7 @@
             },
             {
                 "progress":45,
-                "logText":"Ehrenfest revealed his true intentions, but fled before getting surrounded. According with his own words, he will be waiting for General Ortholion in the Elm mine.",
+                "logText":"Ehrenfest revealed his true intentions, but fled before getting surrounded. He told me he will be waiting for General Ortholion in the Elm mine.",
                 "rewardExperience":1000
             },
             {
diff --git a/AndorsTrail/res/values/loadresources.xml b/AndorsTrail/res/values/loadresources.xml
index b14b09688..8c5802df9 100644
--- a/AndorsTrail/res/values/loadresources.xml
+++ b/AndorsTrail/res/values/loadresources.xml
@@ -157,7 +157,8 @@
         <item>@raw/questlist_shortcut_lodar</item>
         <item>@raw/questlist_pathway_fallhaven</item>
         <item>@raw/questlist_halvor_surprise</item>
-                                                                                                -		
+                                                                                                        -		
+        
         
         
         
diff --git a/AndorsTrail/res/xml/blackwater_mountain70.tmx b/AndorsTrail/res/xml/blackwater_mountain70.tmx
index 879fc1ff7..efabc7807 100644
--- a/AndorsTrail/res/xml/blackwater_mountain70.tmx
+++ b/AndorsTrail/res/xml/blackwater_mountain70.tmx
@@ -1,331 +1,332 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.4" tiledversion="1.4.3" orientation="orthogonal" renderorder="right-down" width="10" height="30" tilewidth="32" tileheight="32" infinite="0" nextlayerid="15" nextobjectid="31">
- <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
+<map version="1.0" orientation="orthogonal" width="10" height="30" tilewidth="32" tileheight="32">
+ <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_bed_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_border_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_bridge_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="385" name="map_bridge_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="385" name="map_bridge_2" tilewidth="32" tileheight="32">
   <image source="../drawable/map_bridge_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="513" name="map_broken_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="513" name="map_broken_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_broken_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="641" name="map_cavewall_1" tilewidth="32" tileheight="32" tilecount="108" columns="18">
+ <tileset firstgid="641" name="map_cavewall_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_cavewall_1.png" width="576" height="192"/>
  </tileset>
- <tileset firstgid="749" name="map_cavewall_2" tilewidth="32" tileheight="32" tilecount="108" columns="18">
+ <tileset firstgid="749" name="map_cavewall_2" tilewidth="32" tileheight="32">
   <image source="../drawable/map_cavewall_2.png" width="576" height="192"/>
  </tileset>
- <tileset firstgid="857" name="map_cavewall_3" tilewidth="32" tileheight="32" tilecount="108" columns="18">
+ <tileset firstgid="857" name="map_cavewall_3" tilewidth="32" tileheight="32">
   <image source="../drawable/map_cavewall_3.png" width="576" height="192"/>
  </tileset>
- <tileset firstgid="965" name="map_cavewall_4" tilewidth="32" tileheight="32" tilecount="108" columns="18">
+ <tileset firstgid="965" name="map_cavewall_4" tilewidth="32" tileheight="32">
   <image source="../drawable/map_cavewall_4.png" width="576" height="192"/>
  </tileset>
- <tileset firstgid="1073" name="map_chair_table_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="1073" name="map_chair_table_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_chair_table_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1201" name="map_chair_table_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="1201" name="map_chair_table_2" tilewidth="32" tileheight="32">
   <image source="../drawable/map_chair_table_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1329" name="map_crate_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="1329" name="map_crate_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_crate_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1457" name="map_cupboard_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="1457" name="map_cupboard_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_cupboard_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1585" name="map_curtain_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="1585" name="map_curtain_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_curtain_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1713" name="map_entrance_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="1713" name="map_entrance_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_entrance_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1841" name="map_entrance_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="1841" name="map_entrance_2" tilewidth="32" tileheight="32">
   <image source="../drawable/map_entrance_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1969" name="map_fence_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="1969" name="map_fence_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_fence_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2097" name="map_fence_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="2097" name="map_fence_2" tilewidth="32" tileheight="32">
   <image source="../drawable/map_fence_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2225" name="map_fence_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="2225" name="map_fence_3" tilewidth="32" tileheight="32">
   <image source="../drawable/map_fence_3.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2353" name="map_fence_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="2353" name="map_fence_4" tilewidth="32" tileheight="32">
   <image source="../drawable/map_fence_4.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2481" name="map_ground_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="2481" name="map_ground_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_ground_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2609" name="map_ground_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="2609" name="map_ground_2" tilewidth="32" tileheight="32">
   <image source="../drawable/map_ground_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2737" name="map_ground_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="2737" name="map_ground_3" tilewidth="32" tileheight="32">
   <image source="../drawable/map_ground_3.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2865" name="map_ground_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="2865" name="map_ground_4" tilewidth="32" tileheight="32">
   <image source="../drawable/map_ground_4.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2993" name="map_ground_5" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="2993" name="map_ground_5" tilewidth="32" tileheight="32">
   <image source="../drawable/map_ground_5.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3121" name="map_ground_6" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="3121" name="map_ground_6" tilewidth="32" tileheight="32">
   <image source="../drawable/map_ground_6.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3249" name="map_ground_7" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="3249" name="map_ground_7" tilewidth="32" tileheight="32">
   <image source="../drawable/map_ground_7.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3377" name="map_ground_8" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="3377" name="map_ground_8" tilewidth="32" tileheight="32">
   <image source="../drawable/map_ground_8.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3505" name="map_house_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="3505" name="map_house_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_house_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3633" name="map_house_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="3633" name="map_house_2" tilewidth="32" tileheight="32">
   <image source="../drawable/map_house_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3761" name="map_indoor_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="3761" name="map_indoor_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3889" name="map_indoor_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="3889" name="map_indoor_2" tilewidth="32" tileheight="32">
   <image source="../drawable/map_indoor_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4017" name="map_kitchen_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4017" name="map_kitchen_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4145" name="map_outdoor_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4145" name="map_outdoor_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_outdoor_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4273" name="map_pillar_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4273" name="map_pillar_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_pillar_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4401" name="map_pillar_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4401" name="map_pillar_2" tilewidth="32" tileheight="32">
   <image source="../drawable/map_pillar_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4529" name="map_plant_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4529" name="map_plant_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_plant_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4657" name="map_plant_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4657" name="map_plant_2" tilewidth="32" tileheight="32">
   <image source="../drawable/map_plant_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4785" name="map_rock_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4785" name="map_rock_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_rock_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4913" name="map_rock_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4913" name="map_rock_2" tilewidth="32" tileheight="32">
   <image source="../drawable/map_rock_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5041" name="map_roof_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="5041" name="map_roof_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_roof_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5169" name="map_roof_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="5169" name="map_roof_2" tilewidth="32" tileheight="32">
   <image source="../drawable/map_roof_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5297" name="map_roof_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="5297" name="map_roof_3" tilewidth="32" tileheight="32">
   <image source="../drawable/map_roof_3.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5425" name="map_shop_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="5425" name="map_shop_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_shop_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5553" name="map_sign_ladder_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="5553" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5681" name="map_table_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="5681" name="map_table_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_table_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5809" name="map_trail_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="5809" name="map_trail_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_trail_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5937" name="map_transition_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="5937" name="map_transition_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_transition_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6065" name="map_transition_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="6065" name="map_transition_2" tilewidth="32" tileheight="32">
   <image source="../drawable/map_transition_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6193" name="map_transition_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="6193" name="map_transition_3" tilewidth="32" tileheight="32">
   <image source="../drawable/map_transition_3.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6321" name="map_transition_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="6321" name="map_transition_4" tilewidth="32" tileheight="32">
   <image source="../drawable/map_transition_4.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6449" name="map_transition_6" tilewidth="32" tileheight="32" tilecount="144" columns="18">
+ <tileset firstgid="6449" name="map_transition_6" tilewidth="32" tileheight="32">
   <image source="../drawable/map_transition_6.png" width="576" height="256"/>
  </tileset>
- <tileset firstgid="6593" name="map_tree_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="6593" name="map_tree_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_tree_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6721" name="map_tree_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="6721" name="map_tree_2" tilewidth="32" tileheight="32">
   <image source="../drawable/map_tree_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6849" name="map_wall_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="6849" name="map_wall_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_wall_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6977" name="map_wall_2" tilewidth="32" tileheight="32" tilecount="120" columns="15">
+ <tileset firstgid="6977" name="map_wall_2" tilewidth="32" tileheight="32">
   <image source="../drawable/map_wall_2.png" width="480" height="256"/>
  </tileset>
- <tileset firstgid="7097" name="map_wall_3" tilewidth="32" tileheight="32" tilecount="120" columns="15">
+ <tileset firstgid="7097" name="map_wall_3" tilewidth="32" tileheight="32">
   <image source="../drawable/map_wall_3.png" width="480" height="256"/>
  </tileset>
- <tileset firstgid="7217" name="map_wall_4" tilewidth="32" tileheight="32" tilecount="120" columns="15">
+ <tileset firstgid="7217" name="map_wall_4" tilewidth="32" tileheight="32">
   <image source="../drawable/map_wall_4.png" width="480" height="256"/>
  </tileset>
- <tileset firstgid="7337" name="map_window_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="7337" name="map_window_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_window_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="7465" name="map_window_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="7465" name="map_window_2" tilewidth="32" tileheight="32">
   <image source="../drawable/map_window_2.png" width="512" height="256"/>
  </tileset>
- <layer id="14" name="Base" width="10" height="30">
+ <layer name="Base" width="10" height="30">
   <data encoding="base64" compression="zlib">
-   eJxjYBgFAwU2cg60C0bBKCANrGMaWPsBsIsBaw==
+   eJxjYKAf2MxJR8uGANg4Gh6jYIiBdUwDaz8A0p8CJw==
   </data>
  </layer>
- <layer id="1" name="Ground" width="10" height="30">
+ <layer name="Ground" width="10" height="30">
   <data encoding="base64" compression="zlib">
-   eJzNkssNgzAQRBESBxpIsdRCC3YUUQBuAbsFisgxtsKK0WjXGCmHHJ74PZvZXce+62ImZZ4Zb7AfpON5NhDP2kcIAH9bxvM+Aq7i7QB7Ht69xpOVcgTD25Qcsha9AueQtewV3o/v1UENmod5vZKP2Yw6EJ6b5mh9/CcP51fzcH61vqBnzZe92nzxPLiG+Urt1n8R3+C5i77cPVfFm4bfnD/O2Op9APDl20M=
+   eJzNkssNwjAQRC0kDmkgVEJz1EILNkIUQFqI04IvdMARW8kqo9GuY6QccnjKR8/2eHfjybmYmTKPTDBIC9PyfTcQT9vj0zt3vczvA8Deq1u9CPiKlwD2Avx7ditvyjEY3qjkkLXoFTiHrGWv8O3np5yZDA/zBiUfMxr3QLhvmqPV8Uge9q/mYf9qdUHP6i97tf7iPPiG/srdrXOR0OD5jbr8O1fFu533mT/O2Or9AHVB2mY=
   </data>
  </layer>
- <layer id="2" name="Objects" width="10" height="30">
+ <layer name="Objects" width="10" height="30">
   <data encoding="base64" compression="zlib">
-   eJx9k7FOw0AMhq0sGZCgdymJMsACvAKPwMbMzMBT8Ao8CqwsfYA0YWMoQjCBVJUiQVVERZEQ2Lqzzuck/JKV9Pydz//FBWjrxgAcFgBHRTt3It6nOcBMxCgPucskvK9w/QHjrHDPSnCsJwuwtC53jfHquSwFGGJspzG/8twa4wLP2sP8PsZB2q5dI1Mjc2vdvi/fT5eIm6D/GmNexr0mecyR1sh8l8GjVuM5YqjmwoQeTgduD3lnVZh/N3GNNxP3MUzCuVr6bomR7FjVTjL3XNp4fSE46s9msd8u3Ys9H2U3u7EVanJ/uifWr2cmeahV9bAsYhrT9qD1KPrqO580U7lpz9zMlU89D89iDrS6ZnIHve96/+SDfY/FLFAv0q+eG9L5wNXXPlg/Yv1zM8zpf6LvfNfB8Dc6Fv999iu/Bc8a3wn9bkx8hy9qfq48+wcca3Tu
+   eJx9k79OwzAQxk9ZMiBB7ZREGWABHgEegY2ZmefgFXgUWFn6APnDxlCEYAKpKh2gKqICJAR3ck4+Xxw+6VTX/vl8n30B6OvGABwVAMdFf+1UjGc5wFzEJPdrl4kfr3H+AeOwcFEJjvVkAVbWrV1j1LkbZynAGGM7Dfm14C7wrD1c38c4SPu5G2QaZG6t2/fZ1RMTcVP032AsyrDWJA850hcy36X3qNV2HDGUc2l8DWcjt4e8sypcfzNhjlcT1jFO/Lla+m6JkWytcieZ+13ZcH4pOKrPZqHfmO7Fnvcyzm5s+Zxcn66J9dsx09znqgZYFjGt6XvQehR1DZ1Pmqu12UDfLJRP3Q/Pog+0Yj25g953O//kg33XoheoFulX9w3pfOTyax+sHzH/sen79D/RO99FGH6jE/Hts1/5FtxrfCf0vzXhHb6o/rnq2D9B53PF
   </data>
  </layer>
- <layer id="3" name="Objects_1" width="10" height="30">
+ <layer name="Objects_1" width="10" height="30">
   <data encoding="base64" compression="zlib">
    eJxjYBgFxAImMcJqHokyMAgRoe4HUI0SEeqwgT+CxKn7RaS6UTAKiAXHBjhNAQC7GgVt
   </data>
  </layer>
- <layer id="4" name="Above" width="10" height="30">
+ <layer name="Above" width="10" height="30">
   <data encoding="base64" compression="zlib">
-   eJxjYECAw2IMBEE4EF9CUpcizsDgAsShQBwmjqr2CZK6o0IMDM+AfFOgGjc0dRh2ANWaQdWVszMwVABxJTumulQhiP1pQNwOlO8A4k4s6pDBL0n88jDwkkh1r5DUPWYiTg82ANMLsvcVAbtTmSBqCKm9JIRdfDYWdxJjLylqqWkWKeadIVIdKeATjnBEBtjcR2p6uCmI3zwYwBZ/hACx4YcNYIsjapgXy4Qqhg6Q0/gjaBwAABL5Mp4=
+   eJxjYECAw2IMBEE4EF9CUpcizsDgAsShQBwmjqr2CZK6o0IMDC+A/JdA7IamDsMOIYS6cnYGhgogrmTHVJcqBKHTgOragfIdQNyJRR0y+CWJXx4GXhKp7hWSusdMxOnBBmB6Qfa+ImB3KhNEDSG1l4Swi8/G4k5i7CVFLTXNIsW8M0SqIwV8whGOyACb+0hNDzcF8ZsHA9jijxAgNvywAWxxRA3zYplQxdABchp/BI0DAAj2M4o=
   </data>
  </layer>
- <layer id="6" name="Top" width="10" height="30" visible="0">
+ <layer name="Top" width="10" height="30">
   <data encoding="base64" compression="zlib">
    eJxjYKAMbBViYNgmBGGHCuFXe4yAPDlgNhMDwxwgfiVJfbNHAfWBEv9Au2AUDGUAAIJTBT4=
   </data>
  </layer>
- <layer id="7" name="Walkable" width="10" height="30" visible="0">
+ <layer name="Walkable" width="10" height="30" visible="0">
   <data encoding="base64" compression="zlib">
-   eJy1kcsJACAMQ53C/Vfohp4KIs2nQguejMkzjb1WDJ6cjn6S52W6R/EwNkeHRmmVv+Pn7qLKVYxONxUzy0Vvmc7xc3vr8P3uAemZZ96hN0zHct1/dHQo1+kZdXcAPBOTsw==
+   eJzbKMbAsJGGGAaorZZabkIGuNRiY5OjDhcgpJaQ+cSYR2z4YrOXkBuJCRtsbsZnLy69+NQRYx6x4UaK+8iNB1zq8ZkJk8OlB586fPYS6w9S1OGyl5hwxhV2AAQAkuw=
   </data>
  </layer>
- <layer id="8" name="Walkable_2" width="10" height="30" visible="0">
+ <layer name="Walkable_2" width="10" height="30" visible="0">
   <data encoding="base64" compression="zlib">
-   eJy1kcsJACAMQ53C/Vfohp4KIs2nQguejMkzjb1WDJ6cjn6S52W6R/EwNkeHRmmVv+Pn7qLKVYxONxUzy0Vvmc7xc3vr8P3uAemZZ96hN0zHct1/dHQo1+kZdXcAPBOTsw==
+   eJzbKMbAsJGGGAaorZZabkIGuNRiY5OjDhcgpJaQ+cSYR2z4YrOXkBuJCRtsbsZnLy69+NQRYx6x4UaK+8iNB1zq8ZkJk8OlB586fPYS6w9S1OGyl5hwxhV2AAQAkuw=
   </data>
  </layer>
- <layer id="9" name="Walkable_1" width="10" height="30" visible="0">
+ <layer name="Walkable_1" width="10" height="30" visible="0">
   <data encoding="base64" compression="zlib">
-   eJzbKMbAsJFEjAyoqQ7GJsY8UtRRw0xkt1FDHbF+xqWHHIysF5f96OLEuJPY8Ka2Onzxh0sfsepIiRdqYkrdjSxOTPiRkq6IVYfPHej6sfHx2QEAYCeieA==
+   eJzbKMbAsJFEjAyorQ6fWnLVUcNMmFpkmhJ1yPYRMg+bHnIwsl5c9qOLE+NOYsOb2urwxR8ufcSqIyVeqIkpdTeyODHhR0q6IlYdPneg68fGx2cHACgUobE=
   </data>
  </layer>
- <objectgroup id="10" name="Mapevents" visible="0">
-  <object id="1" name="south" type="mapchange" x="64" y="928" width="64" height="32">
+ <objectgroup name="Mapevents" visible="0">
+  <object name="south" type="mapchange" x="64" y="928" width="64" height="32">
    <properties>
     <property name="map" value="blackwater_mountain14"/>
     <property name="place" value="north2"/>
    </properties>
   </object>
-  <object id="2" name="bwm17_vine_selector" type="script" x="224" y="800" width="96" height="32">
+  <object name="bwm17_vine_selector" type="script" x="224" y="800" width="96" height="32">
    <properties>
     <property name="when" value="enter"/>
    </properties>
   </object>
-  <object id="3" name="bwm17_heights_1" type="script" x="32" y="896" width="128" height="32">
+  <object name="bwm17_heights_1" type="script" x="32" y="896" width="128" height="32">
    <properties>
     <property name="when" value="enter"/>
    </properties>
   </object>
-  <object id="4" name="bwm17_heights2_1" type="script" x="256" y="480" width="32" height="96">
+  <object name="bwm17_heights2_1" type="script" x="256" y="480" width="32" height="96">
    <properties>
     <property name="when" value="enter"/>
    </properties>
   </object>
-  <object id="5" name="bwm17_heights2_1" type="script" x="128" y="192" width="96" height="32">
+  <object name="bwm17_heights2_1" type="script" x="128" y="192" width="96" height="32">
    <properties>
     <property name="when" value="enter"/>
    </properties>
   </object>
-  <object id="6" name="bwm17_heights_1" type="script" x="160" y="256" width="32" height="32">
+  <object name="bwm17_heights_1" type="script" x="160" y="256" width="32" height="32">
    <properties>
     <property name="when" value="enter"/>
    </properties>
   </object>
-  <object id="8" name="hole" type="mapchange" x="288" y="320" width="32" height="32">
+  <object name="hole" type="mapchange" x="288" y="320" width="32" height="32">
    <properties>
     <property name="map" value="blackwater_mountain71"/>
     <property name="place" value="up"/>
    </properties>
   </object>
-  <object id="10" name="east" type="mapchange" x="288" y="512" width="32" height="32">
+  <object name="east" type="mapchange" x="288" y="512" width="32" height="32">
    <properties>
     <property name="map" value="blackwater_mountain15"/>
     <property name="place" value="west"/>
    </properties>
   </object>
-  <object id="11" name="bwm70_sign" type="script" x="128" y="288" width="32" height="32">
+  <object name="bwm70_sign" type="script" x="128" y="288" width="32" height="32">
    <properties>
     <property name="when" value="enter"/>
    </properties>
   </object>
-  <object id="12" name="bwm17_heights2_1" type="script" x="256" y="736" width="32" height="96">
+  <object name="bwm17_heights2_1" type="script" x="256" y="736" width="32" height="96">
    <properties>
     <property name="when" value="enter"/>
    </properties>
   </object>
-  <object id="13" name="east2" type="mapchange" x="288" y="704" width="32" height="96">
+  <object name="east2" type="mapchange" x="288" y="704" width="32" height="96">
    <properties>
     <property name="map" value="blackwater_mountain15"/>
     <property name="place" value="west2"/>
    </properties>
   </object>
-  <object id="14" name="bwm70_corpse" type="script" x="224" y="512" width="32" height="32">
+  <object name="bwm70_corpse" type="script" x="224" y="512" width="32" height="32">
    <properties>
     <property name="when" value="enter"/>
    </properties>
   </object>
  </objectgroup>
- <objectgroup id="11" name="Spawn" visible="0">
-  <object id="15" name="forestboar2" type="spawn" x="64" y="576" width="96" height="256">
+ <objectgroup name="Spawn" visible="0">
+  <object name="forestboar2" type="spawn" x="64" y="576" width="96" height="256">
    <properties>
     <property name="quantity" value="2"/>
     <property name="spawngroup" value="forestboar4"/>
    </properties>
   </object>
-  <object id="16" name="gornaud_2" type="spawn" x="128" y="64" width="128" height="128">
+  <object name="gornaud_2" type="spawn" x="128" y="64" width="128" height="128">
    <properties>
     <property name="spawngroup" value="gornaud_2"/>
    </properties>
   </object>
-  <object id="17" name="gornaud_1" type="spawn" x="192" y="416" width="96" height="128">
+  <object name="gornaud_1" type="spawn" x="192" y="416" width="96" height="128">
    <properties>
     <property name="spawngroup" value="gornaud_2"/>
    </properties>
   </object>
-  <object id="18" name="forestboar1" type="spawn" x="32" y="288" width="96" height="160">
+  <object name="forestboar1" type="spawn" x="32" y="288" width="96" height="160">
    <properties>
     <property name="spawngroup" value="forestboar4"/>
    </properties>
   </object>
-  <object id="19" name="primwolf2" type="spawn" x="64" y="224" width="32" height="64">
+  <object name="primwolf2" type="spawn" x="64" y="224" width="32" height="64">
    <properties>
     <property name="spawngroup" value="primwolf2"/>
    </properties>
   </object>
-  <object id="27" name="bwm17_worker" type="spawn" x="128" y="288" width="32" height="32">
+  <object name="bwm17_worker" type="spawn" x="128" y="288" width="32" height="32">
    <properties>
     <property name="spawngroup" value="bwm17_worker"/>
    </properties>
   </object>
  </objectgroup>
- <objectgroup id="12" name="Keys" visible="0">
-  <object id="57" name="bwm17_hole" type="key" x="288" y="320" width="32" height="32">
+ <objectgroup name="Keys" visible="0">
+  <object name="bwm17_hole" type="key" x="288" y="320" width="32" height="32">
    <properties>
     <property name="phrase" value="bwm17_vine2_1"/>
     <property name="requireId" value="bwm17_vine"/>
@@ -333,7 +334,7 @@
     <property name="requireValue" value="2"/>
    </properties>
   </object>
-  <object id="26" name="bwm17_questenabled" type="key" x="160" y="256" width="32" height="64">
+  <object name="bwm17_questenabled" type="key" x="160" y="256" width="32" height="64">
    <properties>
     <property name="phrase" value="bwm17_questenabled"/>
     <property name="requireId" value="bwm17_vine"/>
@@ -342,8 +343,8 @@
    </properties>
   </object>
  </objectgroup>
- <objectgroup id="13" name="Replace" visible="0">
-  <object id="30" name="bwm17_questenabled2" type="replace" x="256" y="832" width="32" height="32">
+ <objectgroup name="Replace" visible="0">
+  <object name="bwm17_questenabled2" type="replace" x="256" y="832" width="32" height="32">
    <properties>
     <property name="Objects" value="Objects_1"/>
     <property name="requireId" value="bwm17_vine"/>
@@ -351,17 +352,17 @@
     <property name="requireValue" value="3"/>
    </properties>
   </object>
-  <object id="20" name="bwm17_vine:2" type="replace" x="288" y="320" width="32" height="64">
+  <object name="bwm17_vine:2" type="replace" x="288" y="320" width="32" height="64">
    <properties>
     <property name="Objects" value="Objects_1"/>
    </properties>
   </object>
-  <object id="21" name="bwm17_vine:1" type="replace" x="256" y="832" width="32" height="32">
+  <object name="bwm17_vine:1" type="replace" x="256" y="832" width="32" height="32">
    <properties>
     <property name="Objects" value="Above"/>
    </properties>
   </object>
-  <object id="22" name="bwm17_heights:1" type="replace" x="32" y="0" width="256" height="960">
+  <object name="bwm17_heights:1" type="replace" x="32" y="0" width="256" height="960">
    <properties>
     <property name="Walkable" value="Walkable_2"/>
     <property name="requireId" value="bwm17_heights"/>
@@ -369,7 +370,7 @@
     <property name="requireValue" value="1"/>
    </properties>
   </object>
-  <object id="23" name="bwm17_heights:2" type="replace" x="32" y="0" width="256" height="960">
+  <object name="bwm17_heights:2" type="replace" x="32" y="0" width="256" height="960">
    <properties>
     <property name="Walkable" value="Walkable_1"/>
     <property name="requireId" value="bwm17_heights"/>
@@ -378,7 +379,7 @@
     <property name="requireValue" value="1"/>
    </properties>
   </object>
-  <object id="24" name="bwm17_heights:2" type="replace" x="288" y="384" width="32" height="256">
+  <object name="bwm17_heights:2" type="replace" x="288" y="384" width="32" height="256">
    <properties>
     <property name="Walkable" value="Walkable_1"/>
     <property name="requireId" value="bwm17_heights"/>
@@ -387,7 +388,7 @@
     <property name="requireValue" value="1"/>
    </properties>
   </object>
-  <object id="25" name="bwm17_heights:1" type="replace" x="288" y="384" width="32" height="256">
+  <object name="bwm17_heights:1" type="replace" x="288" y="384" width="32" height="256">
    <properties>
     <property name="Walkable" value="Walkable_2"/>
     <property name="requireId" value="bwm17_heights"/>
@@ -395,7 +396,7 @@
     <property name="requireValue" value="1"/>
    </properties>
   </object>
-  <object id="29" name="bwm17_questenabled1" type="replace" x="128" y="224" width="64" height="96">
+  <object name="bwm17_questenabled1" type="replace" x="128" y="224" width="64" height="96">
    <properties>
     <property name="Objects" value="Objects_1"/>
     <property name="requireId" value="bwm17_vine"/>
diff --git a/AndorsTrail/res/xml/blackwater_mountain74.tmx b/AndorsTrail/res/xml/blackwater_mountain74.tmx
index 8d75840e0..3cb2cc0e0 100644
--- a/AndorsTrail/res/xml/blackwater_mountain74.tmx
+++ b/AndorsTrail/res/xml/blackwater_mountain74.tmx
@@ -1,296 +1,296 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.4" tiledversion="1.4.3" orientation="orthogonal" renderorder="right-down" width="25" height="20" tilewidth="32" tileheight="32" infinite="0" nextlayerid="12" nextobjectid="18">
- <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
+<map version="1.0" orientation="orthogonal" width="25" height="20" tilewidth="32" tileheight="32">
+ <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_bed_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_border_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_bridge_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="385" name="map_bridge_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="385" name="map_bridge_2" tilewidth="32" tileheight="32">
   <image source="../drawable/map_bridge_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="513" name="map_broken_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="513" name="map_broken_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_broken_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="641" name="map_cavewall_1" tilewidth="32" tileheight="32" tilecount="108" columns="18">
+ <tileset firstgid="641" name="map_cavewall_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_cavewall_1.png" width="576" height="192"/>
  </tileset>
- <tileset firstgid="749" name="map_cavewall_2" tilewidth="32" tileheight="32" tilecount="108" columns="18">
+ <tileset firstgid="749" name="map_cavewall_2" tilewidth="32" tileheight="32">
   <image source="../drawable/map_cavewall_2.png" width="576" height="192"/>
  </tileset>
- <tileset firstgid="857" name="map_cavewall_3" tilewidth="32" tileheight="32" tilecount="108" columns="18">
+ <tileset firstgid="857" name="map_cavewall_3" tilewidth="32" tileheight="32">
   <image source="../drawable/map_cavewall_3.png" width="576" height="192"/>
  </tileset>
- <tileset firstgid="965" name="map_cavewall_4" tilewidth="32" tileheight="32" tilecount="108" columns="18">
+ <tileset firstgid="965" name="map_cavewall_4" tilewidth="32" tileheight="32">
   <image source="../drawable/map_cavewall_4.png" width="576" height="192"/>
  </tileset>
- <tileset firstgid="1073" name="map_chair_table_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="1073" name="map_chair_table_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_chair_table_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1201" name="map_chair_table_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="1201" name="map_chair_table_2" tilewidth="32" tileheight="32">
   <image source="../drawable/map_chair_table_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1329" name="map_crate_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="1329" name="map_crate_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_crate_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1457" name="map_cupboard_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="1457" name="map_cupboard_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_cupboard_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1585" name="map_curtain_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="1585" name="map_curtain_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_curtain_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1713" name="map_entrance_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="1713" name="map_entrance_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_entrance_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1841" name="map_entrance_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="1841" name="map_entrance_2" tilewidth="32" tileheight="32">
   <image source="../drawable/map_entrance_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1969" name="map_fence_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="1969" name="map_fence_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_fence_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2097" name="map_fence_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="2097" name="map_fence_2" tilewidth="32" tileheight="32">
   <image source="../drawable/map_fence_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2225" name="map_fence_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="2225" name="map_fence_3" tilewidth="32" tileheight="32">
   <image source="../drawable/map_fence_3.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2353" name="map_fence_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="2353" name="map_fence_4" tilewidth="32" tileheight="32">
   <image source="../drawable/map_fence_4.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2481" name="map_ground_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="2481" name="map_ground_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_ground_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2609" name="map_ground_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="2609" name="map_ground_2" tilewidth="32" tileheight="32">
   <image source="../drawable/map_ground_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2737" name="map_ground_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="2737" name="map_ground_3" tilewidth="32" tileheight="32">
   <image source="../drawable/map_ground_3.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2865" name="map_ground_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="2865" name="map_ground_4" tilewidth="32" tileheight="32">
   <image source="../drawable/map_ground_4.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2993" name="map_ground_5" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="2993" name="map_ground_5" tilewidth="32" tileheight="32">
   <image source="../drawable/map_ground_5.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3121" name="map_ground_6" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="3121" name="map_ground_6" tilewidth="32" tileheight="32">
   <image source="../drawable/map_ground_6.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3249" name="map_ground_7" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="3249" name="map_ground_7" tilewidth="32" tileheight="32">
   <image source="../drawable/map_ground_7.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3377" name="map_ground_8" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="3377" name="map_ground_8" tilewidth="32" tileheight="32">
   <image source="../drawable/map_ground_8.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3505" name="map_house_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="3505" name="map_house_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_house_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3633" name="map_house_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="3633" name="map_house_2" tilewidth="32" tileheight="32">
   <image source="../drawable/map_house_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3761" name="map_indoor_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="3761" name="map_indoor_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3889" name="map_indoor_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="3889" name="map_indoor_2" tilewidth="32" tileheight="32">
   <image source="../drawable/map_indoor_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4017" name="map_kitchen_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4017" name="map_kitchen_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4145" name="map_outdoor_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4145" name="map_outdoor_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_outdoor_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4273" name="map_pillar_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4273" name="map_pillar_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_pillar_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4401" name="map_pillar_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4401" name="map_pillar_2" tilewidth="32" tileheight="32">
   <image source="../drawable/map_pillar_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4529" name="map_plant_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4529" name="map_plant_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_plant_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4657" name="map_plant_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4657" name="map_plant_2" tilewidth="32" tileheight="32">
   <image source="../drawable/map_plant_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4785" name="map_rock_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4785" name="map_rock_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_rock_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4913" name="map_rock_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4913" name="map_rock_2" tilewidth="32" tileheight="32">
   <image source="../drawable/map_rock_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5041" name="map_roof_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="5041" name="map_roof_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_roof_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5169" name="map_roof_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="5169" name="map_roof_2" tilewidth="32" tileheight="32">
   <image source="../drawable/map_roof_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5297" name="map_roof_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="5297" name="map_roof_3" tilewidth="32" tileheight="32">
   <image source="../drawable/map_roof_3.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5425" name="map_shop_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="5425" name="map_shop_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_shop_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5553" name="map_sign_ladder_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="5553" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5681" name="map_table_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="5681" name="map_table_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_table_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5809" name="map_trail_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="5809" name="map_trail_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_trail_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5937" name="map_transition_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="5937" name="map_transition_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_transition_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6065" name="map_transition_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="6065" name="map_transition_2" tilewidth="32" tileheight="32">
   <image source="../drawable/map_transition_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6193" name="map_transition_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="6193" name="map_transition_3" tilewidth="32" tileheight="32">
   <image source="../drawable/map_transition_3.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6321" name="map_transition_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="6321" name="map_transition_4" tilewidth="32" tileheight="32">
   <image source="../drawable/map_transition_4.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6449" name="map_transition_6" tilewidth="32" tileheight="32" tilecount="144" columns="18">
+ <tileset firstgid="6449" name="map_transition_6" tilewidth="32" tileheight="32">
   <image source="../drawable/map_transition_6.png" width="576" height="256"/>
  </tileset>
- <tileset firstgid="6593" name="map_tree_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="6593" name="map_tree_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_tree_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6721" name="map_tree_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="6721" name="map_tree_2" tilewidth="32" tileheight="32">
   <image source="../drawable/map_tree_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6849" name="map_wall_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="6849" name="map_wall_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_wall_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6977" name="map_wall_2" tilewidth="32" tileheight="32" tilecount="120" columns="15">
+ <tileset firstgid="6977" name="map_wall_2" tilewidth="32" tileheight="32">
   <image source="../drawable/map_wall_2.png" width="480" height="256"/>
  </tileset>
- <tileset firstgid="7097" name="map_wall_3" tilewidth="32" tileheight="32" tilecount="120" columns="15">
+ <tileset firstgid="7097" name="map_wall_3" tilewidth="32" tileheight="32">
   <image source="../drawable/map_wall_3.png" width="480" height="256"/>
  </tileset>
- <tileset firstgid="7217" name="map_wall_4" tilewidth="32" tileheight="32" tilecount="120" columns="15">
+ <tileset firstgid="7217" name="map_wall_4" tilewidth="32" tileheight="32">
   <image source="../drawable/map_wall_4.png" width="480" height="256"/>
  </tileset>
- <tileset firstgid="7337" name="map_window_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="7337" name="map_window_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_window_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="7465" name="map_window_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="7465" name="map_window_2" tilewidth="32" tileheight="32">
   <image source="../drawable/map_window_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="7593" name="map_cavewall_5" tilewidth="32" tileheight="32" tilecount="36" columns="6">
+ <tileset firstgid="7593" name="map_cavewall_5" tilewidth="32" tileheight="32">
   <image source="../drawable/map_cavewall_5.png" width="192" height="192"/>
  </tileset>
- <layer id="11" name="Base" width="25" height="20">
+ <layer name="Base" width="25" height="20">
   <data encoding="base64" compression="zlib">
    eJxjYECAHbKoeD8TA8MBKKYWQLfjItDsS1BMKzu2cDIwPGGCYGrasQ+K4eEF5VML7ASadQoJb5eFiB2hoR17of44RUM7DgPxUSqaDwMgs09wIvAOGtgBAsjmD7QdlLiBnv5AtofadiHbQat4RzYfF9jMCcFDGWBz/5Yh7icQINUPQ9XPAO6PSGM=
   </data>
  </layer>
- <layer id="1" name="Ground" width="25" height="20">
+ <layer name="Ground" width="25" height="20">
   <data encoding="base64" compression="zlib">
    eJyllb1OwzAQgE23dGB0prwGCxIT4g3gAUA8ARJvADs/YsrISjqkAyAgQYBUCkvLgspIhPiZQerGnexTzOUSp8LSJ0d27j6fkzhJR6kE6AGPoVILwApwAVCj+aQlJzXjTQ7yxC2pc3MHttdO6cjgOp+hFolrYGgdy8Ca9ZzbfgTzYxaTC0i5c5v/ya55G3I+B0rtsr0iR+bEjAX4/iZ2HPP3g3aOkROzPqfUlsOG7clHz76w+SXHfaTUQ1TOF8wh1eH6yEHxxA7kPrY1TPRfB+I6Ckuqy2uc3+sqtd8tHVeQ49TJcwbXh9bxBbEDXV0H1X4AeVLoB4HpaZ47biHnZWRcSBaZ/ToKTR1TwUG8absOj2MIOW8i40LuIrNX+Dw+If6jwdEP5DoI/jzQheC9mBfbjzae9wZXG0fcqcZMdfnOvmjDf+qgc4TGl9h3hPHoSIOSRbhnNTQ0OfhZxdc1K9zBz17u8LHJ1o9MdLND+hZ9SHvkO997zBML70OdA9+Ruv+S5Pier94vuXgdbf8hvv+YW5vr8NXwC+C0Vkw=
   </data>
  </layer>
- <layer id="2" name="Objects" width="25" height="20">
+ <layer name="Objects" width="25" height="20">
   <data encoding="base64" compression="zlib">
-   eJxjYECAM+IMDGZA7CbOQDMw3OxwAeLHQrSzBx28BtrFJEaZGbJMEHoNE241QlA78nCoCRVmYAgTxm8PzPyNggixacDwOiMLYSsB7XgMVFMHVccJpSdzMTBIsjMwSAGxNBAnMeK35xE0/DdDzV0GtCNMHCGnCTRXC2q2JJIdmkCzQ4HqtIF0CNCOYAL2CKL5F5a+QP6zBJprBcSrkcIWZEcIVA3IPSeg/kUH8mhiD5HSE3IaFsIR3mbiCLUgOxqh+qWw2HVeElMMWz4BhZs41L7jYph2YHMrCJwExsF9qB2nZVHtCMORH0HuxWeHOA5/g/SEoJnpArXnFVDuBRp+jccOXADZXej2hKLhO4IQ7IpmB8z9s3HkJWQ7LhFRlqgA1ZiQ4Y8UoNpUAvg20P2mULNNoGJpQPwTaocuDvcdBsp/A+IfRODbaPFwSwxhPjEAFEbIYTkXyP4EFGvkZ2D4LAoJb/T09EmUePMTBRgYmgWwy81FshdfmqUWQLeDEAAA3c9nPQ==
+   eJxjYECAM+IMDGZA7CbOQDMw3OxwAeLHQrSzBx28BtrFJEaZGbJMEHoNE241QlA78nCoCRVmYAgTxm8PzPyNggixacDwOiMLYSsB7XgMVFMHVccJpSdzMTBIsjMwSAGxNBAnMeK35xE0/DdDzV0GtCNMHCGnCTRXC2q2JJIdmkCzQ4HqtIF0CNCOYAL2CKL5F5a+QP6zBJprBcSrkcIWZIcZVA3IPSeg/kUH8mhiD5HSE3IaFsIR3jA73KB2NEL1S2Gx67wkphi2fAIKN3GofcfFMO3A5lYQOAmMg/tQO07LotoRhiM/gtyLzw5xHP4G6QlBM9MFas8roNwLNPwajx24ALK70O0JRcN3BCHYFc0OmPtn48hLyHZcIqIsUQGqMSHDHylAtakE8G2g+02hZptAxdKA+CfUDl0c7jsMlP8GxD+IwLfR4uGWGMJ8YgAojJDDci6Q/Qko1sjPwPBZFBLe6Onpkyjx5icKMDA0C2CXm4tkL740Sy2AbgchAABYr2cf
   </data>
  </layer>
- <layer id="3" name="Above" width="25" height="20">
+ <layer name="Above" width="25" height="20">
   <data encoding="base64" compression="zlib">
    eJxjYECAw2IMeAEheWIANcwYLHacFWRgSBFmYAgTp775l4HmXwLiMqjZbUh24PLfZSzi+5kYGA5AMTq4BFVPih3YxC8CzX4CxbgANjsu4bEjiJGBIRiIIxlxm4kMGIUh9FKg+cuA+KQsfvXIdm8UYmDYJEScPSCALZwv4dBfCBU/CKQPkWAHoTTMLky8WbgArvAnBVDDHaSCuXjSGakAn/uxxTO1wXApD4mNE1zhPZtI/eTGSTwJaYbc8CLWD6QAUtM6APB1Kig=
   </data>
  </layer>
- <layer id="10" name="Top" width="25" height="20">
+ <layer name="Top" width="25" height="20">
   <data encoding="base64" compression="zlib">
    eJxjYBgFo2DwgcNiw8OOS3SwYxSMglEwCkAAAJHuAps=
   </data>
  </layer>
- <layer id="4" name="Walkable" width="25" height="20">
+ <layer name="Walkable" width="25" height="20" visible="0">
   <data encoding="base64" compression="zlib">
    eJzdk10KwCAMgz3F7n8FbzgGeyjSxKTqiwVh/vVL2tmf1vo/vsi+d45bGTFOMOL8JENZd/yyM+o64ilaqv4yBtO2wpj9QyMf+WY6q31lc+TdYSDts/xsn7FcHyh/Vht2X9HJ3pGioVILtQaKRjcq/tm5LK/Sx5W+R0alf45nhfECz/MDsg==
   </data>
  </layer>
- <objectgroup id="5" name="Mapevents" visible="0">
-  <object id="2" name="down1" type="mapchange" x="544" y="544" width="32" height="32">
+ <objectgroup name="Mapevents" visible="0">
+  <object name="down1" type="mapchange" x="544" y="544" width="32" height="32">
    <properties>
     <property name="map" value="blackwater_mountain74_h"/>
     <property name="place" value="up1"/>
    </properties>
   </object>
-  <object id="3" name="down2" type="mapchange" x="352" y="544" width="32" height="32">
+  <object name="down2" type="mapchange" x="352" y="544" width="32" height="32">
    <properties>
     <property name="map" value="blackwater_mountain74_h"/>
     <property name="place" value="up2"/>
    </properties>
   </object>
-  <object id="4" name="west1" type="mapchange" x="0" y="224" width="32" height="64">
+  <object name="west1" type="mapchange" x="0" y="224" width="32" height="64">
    <properties>
     <property name="map" value="blackwater_mountain75"/>
     <property name="place" value="east2"/>
    </properties>
   </object>
-  <object id="6" name="bwm74_waterfall" type="script" x="448" y="608" width="96" height="32">
+  <object name="bwm74_waterfall" type="script" x="448" y="608" width="96" height="32">
    <properties>
     <property name="when" value="enter"/>
    </properties>
   </object>
-  <object id="7" name="bwm74_drop1" type="container" x="128" y="576" width="32" height="32"/>
-  <object id="8" name="north2" type="mapchange" x="96" y="0" width="32" height="32">
+  <object name="bwm74_drop1" type="container" x="128" y="576" width="32" height="32"/>
+  <object name="north2" type="mapchange" x="96" y="0" width="32" height="32">
    <properties>
     <property name="map" value="blackwater_mountain73"/>
     <property name="place" value="south2"/>
    </properties>
   </object>
-  <object id="9" name="north1" type="mapchange" x="192" y="0" width="32" height="32">
+  <object name="north1" type="mapchange" x="192" y="0" width="32" height="32">
    <properties>
     <property name="map" value="blackwater_mountain73"/>
     <property name="place" value="south1"/>
    </properties>
   </object>
-  <object id="10" name="bwm73_drop" type="container" x="128" y="288" width="32" height="32"/>
-  <object id="11" name="bwm73_drop" type="container" x="704" y="320" width="32" height="32"/>
+  <object name="bwm73_drop" type="container" x="128" y="288" width="32" height="32"/>
+  <object name="bwm73_drop" type="container" x="704" y="320" width="32" height="32"/>
  </objectgroup>
- <objectgroup id="6" name="Spawn" visible="0">
-  <object id="12" name="bwm74_monster1" type="spawn" x="256" y="192" width="256" height="256">
+ <objectgroup name="Spawn" visible="0">
+  <object name="bwm74_monster1" type="spawn" x="256" y="192" width="256" height="256">
    <properties>
     <property name="quantity" value="3"/>
     <property name="spawngroup" value="venomfang_2"/>
    </properties>
   </object>
-  <object id="13" name="bwm74_monster2" type="spawn" x="256" y="288" width="256" height="96">
+  <object name="bwm74_monster2" type="spawn" x="256" y="288" width="256" height="96">
    <properties>
     <property name="quantity" value="3"/>
     <property name="spawngroup" value="tough_venomfang"/>
    </properties>
   </object>
-  <object id="14" name="bwm74_monster3" type="spawn" x="640" y="384" width="96" height="128">
+  <object name="bwm74_monster3" type="spawn" x="640" y="384" width="96" height="128">
    <properties>
     <property name="quantity" value="2"/>
     <property name="spawngroup" value="kazaul_1"/>
    </properties>
   </object>
-  <object id="15" name="bwm74_monster4" type="spawn" x="480" y="160" width="256" height="64">
+  <object name="bwm74_monster4" type="spawn" x="480" y="160" width="256" height="64">
    <properties>
     <property name="quantity" value="2"/>
     <property name="spawngroup" value="bwm_olm"/>
    </properties>
   </object>
-  <object id="16" name="bwm74_monster5" type="spawn" x="64" y="384" width="256" height="192">
+  <object name="bwm74_monster5" type="spawn" x="64" y="384" width="256" height="192">
    <properties>
     <property name="quantity" value="4"/>
     <property name="spawngroup" value="bwm_olm"/>
    </properties>
   </object>
-  <object id="17" name="bwm74_monster6" type="spawn" x="64" y="192" width="96" height="96">
+  <object name="bwm74_monster6" type="spawn" x="64" y="192" width="96" height="96">
    <properties>
-    <property name="quantity" value="1"/>
     <property name="spawngroup" value="bwm_olm"/>
    </properties>
   </object>
  </objectgroup>
- <objectgroup id="7" name="Keys" visible="0"/>
- <objectgroup id="8" name="Replace" visible="0"/>
+ <objectgroup name="Keys" visible="0"/>
+ <objectgroup name="Replace" visible="0"/>
 </map>
diff --git a/AndorsTrail/res/xml/elm_2f_3.tmx b/AndorsTrail/res/xml/elm_2f_3.tmx
index 78067be86..0201b0d70 100644
--- a/AndorsTrail/res/xml/elm_2f_3.tmx
+++ b/AndorsTrail/res/xml/elm_2f_3.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.4" tiledversion="1.4.3" orientation="orthogonal" renderorder="right-down" width="10" height="15" tilewidth="32" tileheight="32" infinite="0" nextlayerid="10" nextobjectid="4">
+<map version="1.2" tiledversion="1.3.0" orientation="orthogonal" renderorder="right-down" compressionlevel="0" width="10" height="15" tilewidth="32" tileheight="32" infinite="0" nextlayerid="10" nextobjectid="4">
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_bed_1.png" width="512" height="256"/>
  </tileset>
@@ -188,27 +188,27 @@
  </tileset>
  <layer id="1" name="Ground" width="10" height="15">
   <data encoding="base64" compression="zlib">
-   eJzFzrEOQDAQxvGbSVebB+MxGdoOGOjSd2DjOVxD43OpsBn+SdP7pb22IGoTmfJeykTXP7gG7i03cZ1wOA+zgfPcyOnyMjgPM8dViqhWh9PiHyf2j7ug8+c5y480eHQztzw43H/lNnDSGPHfm7Mf3kKX2usvtwO5cXBE
+   eAG9jjEOgkAQRaeG0NJ5MDwmFGqhFkrDHbSTc/Bf9CeTDYaO4mV257+d2aGNGFY4HyIyaw49nFtys9en/kXnp7j+eva8g5zsLibxECfhHTknG0XXRBwFHjDLe8g9m+q/ZI89ZFX9xRk9n5n3Eu8/nnfgfcScPGdl9T7XMvedmVsOrj3/2e/Luqe3ALlxcEQ=
   </data>
  </layer>
  <layer id="2" name="Objects" width="10" height="15">
   <data encoding="base64" compression="zlib">
-   eJxjYCAfbJQlT44cNTuA9D4o+ySQPo3ExgVg6vDZA5LfJc7AsFucsFvOANXsoYK61+IQ/IZI84YiAACtyhQK
+   eAFjYCAfbJTFrRefHEwXKWp2AO3aB7XvJJA+jcSGmYdOw9Thswdkzi5xBobdQEwInAGq2UMFda+BZoDwGyLNI+SuwSgPAK3KFAo=
   </data>
  </layer>
  <layer id="3" name="Above" width="10" height="15">
   <data encoding="base64" compression="zlib">
-   eJxjYBj+YKPsQLsAFRwWQ7CJcdtgcz8xAAAtXANE
+   eAFjYBj+YKPs4PLjYTGEe4hxGzFqECYODhYALVwDRA==
   </data>
  </layer>
- <layer id="4" name="Top" width="10" height="15" locked="1">
+ <layer id="4" name="Top" width="10" height="15">
   <data encoding="base64" compression="zlib">
-   eJxjYKAfOCxGHXWXofKXcKg7TECe2u4hVd1mWeLUgcDlAXIjpeoAQ7UM7Q==
+   eAFjYKAfOCxGnF2E1F2GmnMJh3kw/bjkYa6AqYPxcdHUVrdZFpdNmOIwv2LKoIpQ242UmgcAQ7UM7Q==
   </data>
  </layer>
- <layer id="5" name="Walkable" width="10" height="15" visible="0">
+ <layer id="5" name="Walkable" width="10" height="15">
   <data encoding="base64" compression="zlib">
-   eJxjYMAONoqhYmLUIKvDJoeujpAaaplBSB0hNxPyM64wosROavuR3uoAgCRbuw==
+   eAFjYMAONooxMCBjbKqQ5WFsmDoYHxcNUodLjlhxYs0gpA4kDwK47IXIIkhK1YH0wwAus2DiIHUwNj56sKkDAJoTWvQ=
   </data>
  </layer>
  <objectgroup id="6" name="Mapevents">
diff --git a/AndorsTrail/res/xml/elm_4f_1.tmx b/AndorsTrail/res/xml/elm_4f_1.tmx
index 6c371191a..a1f10f75a 100644
--- a/AndorsTrail/res/xml/elm_4f_1.tmx
+++ b/AndorsTrail/res/xml/elm_4f_1.tmx
@@ -1,351 +1,352 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.4" tiledversion="1.4.3" orientation="orthogonal" renderorder="right-down" width="15" height="20" tilewidth="32" tileheight="32" infinite="0" nextlayerid="12" nextobjectid="29">
- <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
+<map version="1.0" orientation="orthogonal" width="15" height="20" tilewidth="32" tileheight="32">
+ <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_bed_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_border_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_bridge_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="385" name="map_bridge_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="385" name="map_bridge_2" tilewidth="32" tileheight="32">
   <image source="../drawable/map_bridge_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="513" name="map_broken_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="513" name="map_broken_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_broken_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="641" name="map_cavewall_1" tilewidth="32" tileheight="32" tilecount="108" columns="18">
+ <tileset firstgid="641" name="map_cavewall_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_cavewall_1.png" width="576" height="192"/>
  </tileset>
- <tileset firstgid="749" name="map_cavewall_2" tilewidth="32" tileheight="32" tilecount="108" columns="18">
+ <tileset firstgid="749" name="map_cavewall_2" tilewidth="32" tileheight="32">
   <image source="../drawable/map_cavewall_2.png" width="576" height="192"/>
  </tileset>
- <tileset firstgid="857" name="map_cavewall_3" tilewidth="32" tileheight="32" tilecount="108" columns="18">
+ <tileset firstgid="857" name="map_cavewall_3" tilewidth="32" tileheight="32">
   <image source="../drawable/map_cavewall_3.png" width="576" height="192"/>
  </tileset>
- <tileset firstgid="965" name="map_cavewall_4" tilewidth="32" tileheight="32" tilecount="108" columns="18">
+ <tileset firstgid="965" name="map_cavewall_4" tilewidth="32" tileheight="32">
   <image source="../drawable/map_cavewall_4.png" width="576" height="192"/>
  </tileset>
- <tileset firstgid="1073" name="map_chair_table_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="1073" name="map_chair_table_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_chair_table_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1201" name="map_chair_table_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="1201" name="map_chair_table_2" tilewidth="32" tileheight="32">
   <image source="../drawable/map_chair_table_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1329" name="map_crate_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="1329" name="map_crate_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_crate_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1457" name="map_cupboard_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="1457" name="map_cupboard_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_cupboard_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1585" name="map_curtain_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="1585" name="map_curtain_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_curtain_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1713" name="map_entrance_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="1713" name="map_entrance_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_entrance_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1841" name="map_entrance_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="1841" name="map_entrance_2" tilewidth="32" tileheight="32">
   <image source="../drawable/map_entrance_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1969" name="map_fence_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="1969" name="map_fence_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_fence_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2097" name="map_fence_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="2097" name="map_fence_2" tilewidth="32" tileheight="32">
   <image source="../drawable/map_fence_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2225" name="map_fence_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="2225" name="map_fence_3" tilewidth="32" tileheight="32">
   <image source="../drawable/map_fence_3.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2353" name="map_fence_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="2353" name="map_fence_4" tilewidth="32" tileheight="32">
   <image source="../drawable/map_fence_4.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2481" name="map_ground_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="2481" name="map_ground_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_ground_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2609" name="map_ground_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="2609" name="map_ground_2" tilewidth="32" tileheight="32">
   <image source="../drawable/map_ground_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2737" name="map_ground_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="2737" name="map_ground_3" tilewidth="32" tileheight="32">
   <image source="../drawable/map_ground_3.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2865" name="map_ground_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="2865" name="map_ground_4" tilewidth="32" tileheight="32">
   <image source="../drawable/map_ground_4.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2993" name="map_ground_5" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="2993" name="map_ground_5" tilewidth="32" tileheight="32">
   <image source="../drawable/map_ground_5.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3121" name="map_ground_6" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="3121" name="map_ground_6" tilewidth="32" tileheight="32">
   <image source="../drawable/map_ground_6.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3249" name="map_ground_7" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="3249" name="map_ground_7" tilewidth="32" tileheight="32">
   <image source="../drawable/map_ground_7.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3377" name="map_ground_8" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="3377" name="map_ground_8" tilewidth="32" tileheight="32">
   <image source="../drawable/map_ground_8.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3505" name="map_house_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="3505" name="map_house_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_house_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3633" name="map_house_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="3633" name="map_house_2" tilewidth="32" tileheight="32">
   <image source="../drawable/map_house_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3761" name="map_indoor_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="3761" name="map_indoor_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3889" name="map_indoor_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="3889" name="map_indoor_2" tilewidth="32" tileheight="32">
   <image source="../drawable/map_indoor_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4017" name="map_kitchen_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4017" name="map_kitchen_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4145" name="map_outdoor_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4145" name="map_outdoor_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_outdoor_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4273" name="map_pillar_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4273" name="map_pillar_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_pillar_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4401" name="map_pillar_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4401" name="map_pillar_2" tilewidth="32" tileheight="32">
   <image source="../drawable/map_pillar_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4529" name="map_plant_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4529" name="map_plant_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_plant_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4657" name="map_plant_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4657" name="map_plant_2" tilewidth="32" tileheight="32">
   <image source="../drawable/map_plant_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4785" name="map_rock_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4785" name="map_rock_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_rock_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4913" name="map_rock_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4913" name="map_rock_2" tilewidth="32" tileheight="32">
   <image source="../drawable/map_rock_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5041" name="map_roof_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="5041" name="map_roof_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_roof_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5169" name="map_roof_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="5169" name="map_roof_2" tilewidth="32" tileheight="32">
   <image source="../drawable/map_roof_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5297" name="map_roof_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="5297" name="map_roof_3" tilewidth="32" tileheight="32">
   <image source="../drawable/map_roof_3.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5425" name="map_shop_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="5425" name="map_shop_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_shop_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5553" name="map_sign_ladder_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="5553" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5681" name="map_table_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="5681" name="map_table_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_table_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5809" name="map_trail_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="5809" name="map_trail_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_trail_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5937" name="map_transition_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="5937" name="map_transition_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_transition_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6065" name="map_transition_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="6065" name="map_transition_2" tilewidth="32" tileheight="32">
   <image source="../drawable/map_transition_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6193" name="map_transition_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="6193" name="map_transition_3" tilewidth="32" tileheight="32">
   <image source="../drawable/map_transition_3.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6321" name="map_transition_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="6321" name="map_transition_4" tilewidth="32" tileheight="32">
   <image source="../drawable/map_transition_4.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6449" name="map_transition_6" tilewidth="32" tileheight="32" tilecount="144" columns="18">
+ <tileset firstgid="6449" name="map_transition_6" tilewidth="32" tileheight="32">
   <image source="../drawable/map_transition_6.png" width="576" height="256"/>
  </tileset>
- <tileset firstgid="6593" name="map_tree_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="6593" name="map_tree_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_tree_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6721" name="map_tree_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="6721" name="map_tree_2" tilewidth="32" tileheight="32">
   <image source="../drawable/map_tree_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6849" name="map_wall_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="6849" name="map_wall_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_wall_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6977" name="map_wall_2" tilewidth="32" tileheight="32" tilecount="120" columns="15">
+ <tileset firstgid="6977" name="map_wall_2" tilewidth="32" tileheight="32">
   <image source="../drawable/map_wall_2.png" width="480" height="256"/>
  </tileset>
- <tileset firstgid="7097" name="map_wall_3" tilewidth="32" tileheight="32" tilecount="120" columns="15">
+ <tileset firstgid="7097" name="map_wall_3" tilewidth="32" tileheight="32">
   <image source="../drawable/map_wall_3.png" width="480" height="256"/>
  </tileset>
- <tileset firstgid="7217" name="map_wall_4" tilewidth="32" tileheight="32" tilecount="120" columns="15">
+ <tileset firstgid="7217" name="map_wall_4" tilewidth="32" tileheight="32">
   <image source="../drawable/map_wall_4.png" width="480" height="256"/>
  </tileset>
- <tileset firstgid="7337" name="map_window_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="7337" name="map_window_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_window_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="7465" name="map_window_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="7465" name="map_window_2" tilewidth="32" tileheight="32">
   <image source="../drawable/map_window_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="7593" name="map_cavewall_5" tilewidth="32" tileheight="32" tilecount="36" columns="6">
+ <tileset firstgid="7593" name="map_cavewall_5" tilewidth="32" tileheight="32">
   <image source="../drawable/map_cavewall_5.png" width="192" height="192"/>
  </tileset>
- <tileset firstgid="7629" name="map_sign_ladder_omi2" tilewidth="32" tileheight="32" tilecount="32" columns="8">
+ <tileset firstgid="7629" name="map_sign_ladder_omi2" tilewidth="32" tileheight="32">
   <image source="../drawable/map_sign_ladder_omi2.png" width="256" height="128"/>
  </tileset>
- <tileset firstgid="7661" name="map_rock_3" tilewidth="32" tileheight="32" tilecount="30" columns="6">
+ <tileset firstgid="7661" name="map_rock_3" tilewidth="32" tileheight="32">
   <image source="../drawable/map_rock_3.png" width="192" height="160"/>
  </tileset>
- <layer id="1" name="Ground" width="15" height="20">
+ <layer name="Ground" width="15" height="20">
   <data encoding="base64" compression="zlib">
-   eJydkzEOwjAMRSuxwRkscX8xZUmKRDqEMrCX8+CIWHxcO60YntRYfk0cO4mGIe9gYq7MgwlMYsYWv28wt3zxxK3x5waSn5WbFOfDBx0f2xmi4Xq1oh8MV/7pEcG33F69kb51XBroHk8+sleBs+xxsS8JztJzA609rNtzi8pDd2Fe6h9ejdKbYLgTuPUu0V2agzHs0dzZN5Id69Xrud5s9Fy8q3/3resbrefc6qvkZVjLbOk3ovuJMxjbutDvm7Y8PYM40/X7DYqjz7w=
+   eJydkzEOwjAMRSuxwRkicX8xZUmK1HZIy8BezoMjbPFx7bRieFJr+SVx7OTQdeMBJuJOPIhIZKLn+LzDwvniiVvjzx0kf1RuVlxPH3S85zMkw/VqRT8arqzpkcC33Fa9KXzruDHoni8+sleBsxxxsS8ZztJyY9h6WLfnFpWH7kq81BpejdKbaLgTuPUu0V3ZwRj2aGnsm4Ida9Xrud5stFy8q3/3rf9D2M651VfJk/c/wGzpN6L7iTO48H8Jv2/a8vQM4kzX7zeSg8/R
   </data>
  </layer>
- <layer id="2" name="Objects" width="15" height="20">
+ <layer name="Objects" width="15" height="20">
   <data encoding="base64" compression="zlib">
    eJxbL87AsEOWgSSwEah+syxC33MhVHluJsL60cFcoDvmAbEUUO98cYT4aajaZcIMDMuFMcUDBRgY6oHqfwH5rHIMDP1AdiVQXRWS2jtAuYtCEDuQgS5QbC1QrA6Ia4F4PRB3AvV1CTNggLXimGIgALL7M9QtfkyofpmPQw+y3n6omjgmhBgb1B8gNwuiuWUXUPyNOMQ966F6zwDV7RbHDCN0cEYc4jaYu84C3X0OLS6wxQ1ML8zO1XjSC8jN6Ga+wREOr4FqU4Hu3SyE6Z7DYhAaOSxPymKqu4iW9pABLF30I9kP8x8oHF8jicPSxmWovSC/rkMK40tCCH3o/qmH8k8TyEegMEQPc1i6gvkXn96rQH3XsNiBTe8tJDeeArJvA/FpLPEA03seaO4FIP4OxD+A+Asev8DyOyE3o5cL2MBmLPacRBJDTq8gAAB/tl+N
   </data>
  </layer>
- <layer id="3" name="Above" width="15" height="20">
+ <layer name="Above" width="15" height="20">
   <data encoding="base64" compression="zlib">
-   eJxjYCANHBZjYHgohCp2WYw4vdOEGRimC6Pqu4Smd544hM4EqssSRpXbKAuhHfgh7sAFfJhwuy+AgN4YoN4AJuxyCTj09osjqYHplUOIMQL9UUDAXhj4Bw3b1bKo4sToxQYIhRU6OIlkL6GwwgbOQvXjCitiACisNssSVocMQGljE4l6sAFOHHGPDBJxqJEkQu9Agk9C+OU3Ehl+slB/EoojViLCg5h4Rk6TAIk9IJM=
+   eJxjYCANHBZjYHgohCp2WYw4vdOEGRimC6Pqu4Smd544hM4EqssSRpXbKAuhHfgh7sAFfJhwuy+AgN4YoN4AJuxyCTj09osjqYHplUOIMQL9UUDAXhj4Bw3b1bKo4sToxQYIhRU6OIlkL6GwwgbOQvXjCitiACisNssSVocMQGljExF6Pgnhl+fEEffIIBGHGkki9A4kIOT3jUSGuSzUn4TiiJWI8CBkxjZZ1DQJAF1cImo=
   </data>
  </layer>
- <layer id="4" name="Top" width="15" height="20">
+ <layer name="Top" width="15" height="20">
   <data encoding="base64" compression="zlib">
    eJxjYCAeHBYjQTEauESk3v+y5NtBT0BJWODTO02YgWE6EH8Uoq+9o3qHj96PwDz0icR8BNL7BUlPvzD57qAlAAAmAhQJ
   </data>
  </layer>
- <layer id="5" name="Walkable" width="15" height="20" visible="0">
+ <layer name="Walkable" width="15" height="20" visible="0">
   <data encoding="base64" compression="zlib">
-   eJzbKMbAsJFIDALEqsWmFwbI0YvLPHR5dDY2O/EBYvSS61dKww+X2ynRS8gcbHpx+RMfjU0vsWFGrL2E3E4o7eBLI7jMIVUvPn8So5eU+CVWL7XkCfmNmPxCSC0AbBeLJg==
+   eJzbKMbAsJFIDALEqsWmFwbI0YvLPHR5dDY2O/EBYvSS61dKww+X2ynRS8gcbHpx+RMfjU0vsWFGrL2E3E4o7eBLI7jMIVUvPn8SoxdX2BGrl9R8SYo8IbXE5BdCegHjOIsm
   </data>
  </layer>
- <layer id="6" name="Walkable_2" width="15" height="20" visible="0">
+ <layer name="Walkable_2" width="15" height="20" visible="0">
   <data encoding="base64" compression="zlib">
    eJxjYBgFpIKNYhA8EHrJBaN6R/UOBwAAtUcK4w==
   </data>
  </layer>
- <layer id="7" name="Walkable_1" width="15" height="20" visible="0">
+ <layer name="Walkable_1" width="15" height="20" visible="0">
   <data encoding="base64" compression="zlib">
    eJxjYBgF5ICNYqN6R/UOH71DBQAAWewJVQ==
   </data>
  </layer>
- <objectgroup id="8" name="Mapevents" visible="0">
-  <object id="1" name="elm4f_up" type="script" x="32" y="544" width="64" height="32">
+ <objectgroup name="Mapevents">
+  <object name="elm4f_up" type="script" x="32" y="544" width="64" height="32">
    <properties>
     <property name="when" value="enter"/>
    </properties>
   </object>
-  <object id="2" name="elm4f_down" type="script" x="96" y="544" width="32" height="32">
+  <object name="elm4f_down" type="script" x="96" y="544" width="32" height="32">
    <properties>
     <property name="when" value="enter"/>
    </properties>
   </object>
-  <object id="3" name="up" type="mapchange" x="448" y="288" width="32" height="64">
+  <object name="up" type="mapchange" x="448" y="288" width="32" height="64">
    <properties>
     <property name="map" value="elm_3f"/>
     <property name="place" value="down"/>
    </properties>
   </object>
-  <object id="4" name="elm2f_trap" type="script" x="128" y="96" width="128" height="64">
+  <object name="elm2f_trap" type="script" x="128" y="96" width="128" height="64">
    <properties>
     <property name="when" value="round"/>
    </properties>
   </object>
-  <object id="5" name="elm2f_trap" type="script" x="160" y="224" width="64" height="32">
+  <object name="elm2f_trap" type="script" x="160" y="224" width="64" height="32">
    <properties>
     <property name="when" value="round"/>
    </properties>
   </object>
-  <object id="6" name="elm2f_trap" type="script" x="128" y="256" width="64" height="64">
+  <object name="elm2f_trap" type="script" x="128" y="256" width="64" height="64">
    <properties>
     <property name="when" value="round"/>
    </properties>
   </object>
-  <object id="7" name="elm2f_trap" type="script" x="128" y="352" width="64" height="96">
+  <object name="elm2f_trap" type="script" x="128" y="352" width="64" height="96">
    <properties>
     <property name="when" value="round"/>
    </properties>
   </object>
-  <object id="8" name="elm2f_trap" type="script" x="320" y="160" width="96" height="32">
+  <object name="elm2f_trap" type="script" x="320" y="160" width="96" height="32">
    <properties>
     <property name="when" value="round"/>
    </properties>
   </object>
-  <object id="9" name="south" type="mapchange" x="128" y="608" width="128" height="32">
+  <object name="south" type="mapchange" x="128" y="608" width="128" height="32">
    <properties>
     <property name="map" value="elm_4f_2"/>
     <property name="place" value="north1"/>
    </properties>
   </object>
-  <object id="10" name="north" type="mapchange" x="352" y="0" width="32" height="32">
+  <object name="north" type="mapchange" x="352" y="0" width="32" height="32">
    <properties>
     <property name="map" value="elm_4f_4"/>
     <property name="place" value="south2"/>
    </properties>
   </object>
-  <object id="11" name="down" type="mapchange" x="384" y="96" width="32" height="32">
+  <object name="down" type="mapchange" x="384" y="96" width="32" height="32">
    <properties>
     <property name="map" value="elm5f_1"/>
     <property name="place" value="up"/>
    </properties>
   </object>
-  <object id="27" name="silver_bar" type="container" x="224" y="96" width="32" height="32"/>
-  <object id="28" name="lead_bar" type="container" x="224" y="576" width="32" height="32"/>
+  <object name="silver_bar" type="container" x="224" y="96" width="32" height="32"/>
+  <object name="lead_bar" type="container" x="224" y="576" width="32" height="32"/>
  </objectgroup>
- <objectgroup id="9" name="Spawn" visible="0">
-  <object id="12" name="elm4f_monster1" type="spawn" x="384" y="384" width="32" height="32">
+ <objectgroup name="Spawn" visible="0">
+  <object name="elm4f_monster1" type="spawn" x="384" y="384" width="32" height="32">
    <properties>
     <property name="spawngroup" value="elm_mine3"/>
    </properties>
   </object>
-  <object id="13" name="elm4f_monster2" type="spawn" x="352" y="448" width="32" height="32">
+  <object name="elm4f_monster2" type="spawn" x="352" y="448" width="32" height="32">
    <properties>
     <property name="spawngroup" value="elm_mine3"/>
    </properties>
   </object>
-  <object id="14" name="elm4f_monster3" type="spawn" x="320" y="384" width="32" height="32">
+  <object name="elm4f_monster3" type="spawn" x="320" y="384" width="32" height="32">
    <properties>
     <property name="spawngroup" value="elm_mine2"/>
    </properties>
   </object>
-  <object id="15" name="elm4f_monster4" type="spawn" x="288" y="384" width="32" height="32">
+  <object name="elm4f_monster4" type="spawn" x="288" y="384" width="32" height="32">
    <properties>
     <property name="spawngroup" value="elm_mine1"/>
    </properties>
   </object>
-  <object id="16" name="elm4f_monster5" type="spawn" x="256" y="288" width="64" height="32">
+  <object name="elm4f_monster5" type="spawn" x="256" y="288" width="64" height="32">
    <properties>
     <property name="quantity" value="2"/>
     <property name="spawngroup" value="elm_mine1"/>
    </properties>
   </object>
-  <object id="17" name="elm4f_monster6" type="spawn" x="128" y="448" width="96" height="96">
+  <object name="elm4f_monster6" type="spawn" x="128" y="448" width="96" height="96">
    <properties>
     <property name="quantity" value="2"/>
     <property name="spawngroup" value="elm_mine3"/>
    </properties>
   </object>
-  <object id="18" name="elm4f_monster7" type="spawn" x="256" y="512" width="128" height="96">
+  <object name="elm4f_monster7" type="spawn" x="256" y="512" width="128" height="96">
    <properties>
     <property name="quantity" value="3"/>
     <property name="spawngroup" value="elm_mine1"/>
    </properties>
   </object>
-  <object id="19" name="elm4f_monster8" type="spawn" x="32" y="96" width="32" height="192">
+  <object name="elm4f_monster8" type="spawn" x="32" y="96" width="32" height="192">
    <properties>
     <property name="spawngroup" value="shadowfang1"/>
    </properties>
   </object>
-  <object id="20" name="elm4f_monster9" type="spawn" x="320" y="64" width="64" height="96">
+  <object name="elm4f_monster9" type="spawn" x="320" y="64" width="64" height="96">
    <properties>
     <property name="quantity" value="2"/>
     <property name="spawngroup" value="elm_mine5"/>
    </properties>
   </object>
-  <object id="21" name="elm4f_monster10" type="spawn" x="416" y="32" width="32" height="32">
+  <object name="elm4f_monster10" type="spawn" x="416" y="32" width="32" height="32">
    <properties>
     <property name="spawngroup" value="elm_mine2"/>
    </properties>
   </object>
  </objectgroup>
- <objectgroup id="10" name="Keys"/>
- <objectgroup id="11" name="Replace" visible="0">
-  <object id="22" name="height_up" type="replace" x="64" y="160" width="64" height="384">
+ <objectgroup name="Keys"/>
+ <objectgroup name="Replace" visible="0">
+  <object name="height_up" type="replace" x="64" y="160" width="64" height="384">
    <properties>
     <property name="Walkable" value="Walkable_1"/>
     <property name="requireId" value="bwm72_beginning"/>
@@ -353,7 +354,7 @@
     <property name="requireValue" value="36"/>
    </properties>
   </object>
-  <object id="23" name="height_down" type="replace" x="64" y="160" width="64" height="384">
+  <object name="height_down" type="replace" x="64" y="160" width="64" height="384">
    <properties>
     <property name="Walkable" value="Walkable_2"/>
     <property name="requireId" value="bwm72_beginning"/>
diff --git a/AndorsTrail/res/xml/elm_4f_2.tmx b/AndorsTrail/res/xml/elm_4f_2.tmx
index b773c4560..27196ebbd 100644
--- a/AndorsTrail/res/xml/elm_4f_2.tmx
+++ b/AndorsTrail/res/xml/elm_4f_2.tmx
@@ -1,305 +1,306 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.4" tiledversion="1.4.3" orientation="orthogonal" renderorder="right-down" width="31" height="10" tilewidth="32" tileheight="32" infinite="0" nextlayerid="11" nextobjectid="15">
- <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
+<map version="1.0" orientation="orthogonal" width="31" height="10" tilewidth="32" tileheight="32">
+ <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_bed_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_border_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_bridge_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="385" name="map_bridge_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="385" name="map_bridge_2" tilewidth="32" tileheight="32">
   <image source="../drawable/map_bridge_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32" tilecount="108" columns="18">
+ <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_cavewall_1.png" width="576" height="192"/>
  </tileset>
- <tileset firstgid="621" name="map_cavewall_3" tilewidth="32" tileheight="32" tilecount="108" columns="18">
+ <tileset firstgid="621" name="map_cavewall_3" tilewidth="32" tileheight="32">
   <image source="../drawable/map_cavewall_3.png" width="576" height="192"/>
  </tileset>
- <tileset firstgid="729" name="map_cavewall_4" tilewidth="32" tileheight="32" tilecount="108" columns="18">
+ <tileset firstgid="729" name="map_cavewall_4" tilewidth="32" tileheight="32">
   <image source="../drawable/map_cavewall_4.png" width="576" height="192"/>
  </tileset>
- <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_chair_table_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="965" name="map_chair_table_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="965" name="map_chair_table_2" tilewidth="32" tileheight="32">
   <image source="../drawable/map_chair_table_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1093" name="map_crate_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="1093" name="map_crate_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_crate_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1221" name="map_cupboard_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="1221" name="map_cupboard_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_cupboard_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1349" name="map_curtain_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="1349" name="map_curtain_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_curtain_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1477" name="map_entrance_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="1477" name="map_entrance_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_entrance_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1605" name="map_entrance_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="1605" name="map_entrance_2" tilewidth="32" tileheight="32">
   <image source="../drawable/map_entrance_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1733" name="map_fence_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="1733" name="map_fence_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_fence_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1861" name="map_fence_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="1861" name="map_fence_2" tilewidth="32" tileheight="32">
   <image source="../drawable/map_fence_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1989" name="map_fence_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="1989" name="map_fence_3" tilewidth="32" tileheight="32">
   <image source="../drawable/map_fence_3.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2117" name="map_fence_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="2117" name="map_fence_4" tilewidth="32" tileheight="32">
   <image source="../drawable/map_fence_4.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2245" name="map_ground_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="2245" name="map_ground_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_ground_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2373" name="map_ground_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="2373" name="map_ground_2" tilewidth="32" tileheight="32">
   <image source="../drawable/map_ground_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2501" name="map_ground_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="2501" name="map_ground_4" tilewidth="32" tileheight="32">
   <image source="../drawable/map_ground_4.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2629" name="map_ground_5" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="2629" name="map_ground_5" tilewidth="32" tileheight="32">
   <image source="../drawable/map_ground_5.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2757" name="map_ground_6" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="2757" name="map_ground_6" tilewidth="32" tileheight="32">
   <image source="../drawable/map_ground_6.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2885" name="map_ground_7" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="2885" name="map_ground_7" tilewidth="32" tileheight="32">
   <image source="../drawable/map_ground_7.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3013" name="map_ground_8" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="3013" name="map_ground_8" tilewidth="32" tileheight="32">
   <image source="../drawable/map_ground_8.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3141" name="map_house_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="3141" name="map_house_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_house_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3269" name="map_house_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="3269" name="map_house_2" tilewidth="32" tileheight="32">
   <image source="../drawable/map_house_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3397" name="map_indoor_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="3397" name="map_indoor_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3525" name="map_kitchen_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="3525" name="map_kitchen_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3653" name="map_pillar_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="3653" name="map_pillar_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_pillar_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3781" name="map_pillar_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="3781" name="map_pillar_2" tilewidth="32" tileheight="32">
   <image source="../drawable/map_pillar_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3909" name="map_plant_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="3909" name="map_plant_2" tilewidth="32" tileheight="32">
   <image source="../drawable/map_plant_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4037" name="map_roof_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4037" name="map_roof_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_roof_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4165" name="map_roof_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4165" name="map_roof_2" tilewidth="32" tileheight="32">
   <image source="../drawable/map_roof_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4293" name="map_roof_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4293" name="map_roof_3" tilewidth="32" tileheight="32">
   <image source="../drawable/map_roof_3.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4421" name="map_shop_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4421" name="map_shop_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_shop_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4549" name="map_sign_ladder_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4549" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4677" name="map_table_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4677" name="map_table_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_table_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4805" name="map_transition_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4805" name="map_transition_3" tilewidth="32" tileheight="32">
   <image source="../drawable/map_transition_3.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4933" name="map_transition_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4933" name="map_transition_4" tilewidth="32" tileheight="32">
   <image source="../drawable/map_transition_4.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5061" name="map_transition_6" tilewidth="32" tileheight="32" tilecount="144" columns="18">
+ <tileset firstgid="5061" name="map_transition_6" tilewidth="32" tileheight="32">
   <image source="../drawable/map_transition_6.png" width="576" height="256"/>
  </tileset>
- <tileset firstgid="5205" name="map_tree_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="5205" name="map_tree_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_tree_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5333" name="map_tree_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="5333" name="map_tree_2" tilewidth="32" tileheight="32">
   <image source="../drawable/map_tree_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5461" name="map_wall_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="5461" name="map_wall_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_wall_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5589" name="map_wall_2" tilewidth="32" tileheight="32" tilecount="120" columns="15">
+ <tileset firstgid="5589" name="map_wall_2" tilewidth="32" tileheight="32">
   <image source="../drawable/map_wall_2.png" width="480" height="256"/>
  </tileset>
- <tileset firstgid="5709" name="map_wall_3" tilewidth="32" tileheight="32" tilecount="120" columns="15">
+ <tileset firstgid="5709" name="map_wall_3" tilewidth="32" tileheight="32">
   <image source="../drawable/map_wall_3.png" width="480" height="256"/>
  </tileset>
- <tileset firstgid="5829" name="map_wall_4" tilewidth="32" tileheight="32" tilecount="120" columns="15">
+ <tileset firstgid="5829" name="map_wall_4" tilewidth="32" tileheight="32">
   <image source="../drawable/map_wall_4.png" width="480" height="256"/>
  </tileset>
- <tileset firstgid="5949" name="map_window_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="5949" name="map_window_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_window_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6077" name="map_window_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="6077" name="map_window_2" tilewidth="32" tileheight="32">
   <image source="../drawable/map_window_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6205" name="map_cavewall_2" tilewidth="32" tileheight="32" tilecount="108" columns="18">
+ <tileset firstgid="6205" name="map_cavewall_2" tilewidth="32" tileheight="32">
   <image source="../drawable/map_cavewall_2.png" width="576" height="192"/>
  </tileset>
- <tileset firstgid="6313" name="map_ground_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="6313" name="map_ground_3" tilewidth="32" tileheight="32">
   <image source="../drawable/map_ground_3.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6441" name="map_rock_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="6441" name="map_rock_2" tilewidth="32" tileheight="32">
   <image source="../drawable/map_rock_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6569" name="map_rock_3" tilewidth="32" tileheight="32" tilecount="30" columns="6">
+ <tileset firstgid="6569" name="map_rock_3" tilewidth="32" tileheight="32">
   <image source="../drawable/map_rock_3.png" width="192" height="160"/>
  </tileset>
- <tileset firstgid="6599" name="map_broken_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="6599" name="map_broken_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_broken_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6727" name="map_rock_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="6727" name="map_rock_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_rock_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6855" name="map_outdoor_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="6855" name="map_outdoor_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_outdoor_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6983" name="map_transition_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="6983" name="map_transition_2" tilewidth="32" tileheight="32">
   <image source="../drawable/map_transition_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="7111" name="map_transition_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="7111" name="map_transition_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_transition_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="7239" name="map_sign_ladder_omi2" tilewidth="32" tileheight="32" tilecount="32" columns="8">
+ <tileset firstgid="7239" name="map_sign_ladder_omi2" tilewidth="32" tileheight="32">
   <image source="../drawable/map_sign_ladder_omi2.png" width="256" height="128"/>
  </tileset>
- <tileset firstgid="7271" name="map_plant_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="7271" name="map_plant_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_plant_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="7399" name="map_trail_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="7399" name="map_trail_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_trail_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="7527" name="map_cavewall_5" tilewidth="32" tileheight="32" tilecount="36" columns="6">
+ <tileset firstgid="7527" name="map_cavewall_5" tilewidth="32" tileheight="32">
   <image source="../drawable/map_cavewall_5.png" width="192" height="192"/>
  </tileset>
- <tileset firstgid="7563" name="map_indoor_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="7563" name="map_indoor_2" tilewidth="32" tileheight="32">
   <image source="../drawable/map_indoor_2.png" width="512" height="256"/>
  </tileset>
- <layer id="10" name="Base" width="31" height="10">
+ <layer name="Base" width="31" height="10">
   <data encoding="base64" compression="zlib">
    eJxjYBgF2ACT5EC7ALsbmmTp745RMAqGGgAAtxMA1g==
   </data>
  </layer>
- <layer id="1" name="Ground" width="31" height="10">
+ <layer name="Ground" width="31" height="10">
   <data encoding="base64" compression="zlib">
    eJyNlMEOgjAMhhsTTUx8AAbhwNmXMT6GJy6AyfQgXHwbH00vetXNrfGn28DDn5Vu69eWQlsStUZnv05JG70VEeXxfRlju3bi56YMbXtn+IN98Xxr11nIxRhVHmfzPWt3Ea72fmvvCqKFckL+CSS5zJRCdgcMWd/R28zdF+P93uim3DrMMJGtId8YuwU28nH/CppjVvmvz5z3INi2H4fSKZUTbcI5SrGkGsi7EQzOqfd1cywtzqXq++YPin0nOCc25tPU+8rGvUQ2v3/ue4yJvbubcw8V+rG23vuX5txKhXlibGazpvo79Q/AOeH8Ur2yHPbVCc39F1Kz8wE7y5tX
   </data>
  </layer>
- <layer id="2" name="Objects" width="31" height="10">
+ <layer name="Objects" width="31" height="10">
   <data encoding="base64" compression="zlib">
    eJylVDtOw0AQnUNAsZu4QpyA0NIklEDMBQhcIDYVDRJxY1HCLehQCqAADkIZJM7Be8qMPF5sFMSTntZez8ybXyIi8hjkT9gbiozAffAkikxjt910IJKDz4j/Am7Dfkf9DMvEd56JlFm/NmN8INYuzjP4ztR/pTUc6XkB3VPwDe/vqk2k+reJlvXiCzYLzb9WmzHuJuDhsO1jMVgvfSrwRp9JarMu75vqrtwMZvC5BO/Utna2W65fjOE1C/XjWSrHSa4GP8M6yYX654Pm3b5P4s86TYv2qV8f2I8nrbfaYP62R1dxPVev6XGfxGLe17Hd665+WPwFcqpC+95mmbv6mOPI7ZHlaz3tgmn4Xr+GZk+Jg7C24Q7bDhSuTuqydw+6/4Yya/c0RddclrHRZk7HodnZPJnlvGf/rd92b7V9bvB/wvjFL7/z/+IbaTJRNA==
   </data>
  </layer>
- <layer id="3" name="Above" width="31" height="10">
+ <layer name="Above" width="31" height="10">
   <data encoding="base64" compression="zlib">
    eJxjYGBgWCTFQBaYRIS+DZKYYu2yCPZjNPl2Mt1CrP27kficVLDrPBb/YQPOMgwMB5HUShKwu4MIt91HMm8DDjY5IBGoPwmPGZ2yuOWIBZlQM2rR/Fkoiel+Mwr8c5pEveh2u0lCMLK8sQz57kEGhPKdO9AuDwrjEgR+ork3XxaS79DFyQWFsqTnW2rm8+1Av+xACycA8IgcMA==
   </data>
  </layer>
- <layer id="4" name="Top" width="31" height="10">
+ <layer name="Top" width="31" height="10">
   <data encoding="base64" compression="zlib">
    eJxjYECAnzIMFANyzeCQpcxeTlnSzeDEoR6XOLXsBQFc4QQTf0ZEOJIbZoTspiVAt6NfBlV8gyQDQ5Ekpj4zLGKU2o1LHDn+zYH2WtDRbnT+YyrYXYgjnaCL0yP+aQGw5VcAbEwWqA==
   </data>
  </layer>
- <layer id="5" name="Walkable" width="31" height="10">
+ <layer name="Walkable" width="31" height="10" visible="0">
   <data encoding="base64" compression="zlib">
-   eJy9klkKACAIRD2I97+a1+inQKJxRqgEIXJ5buFmMZVJONZl78Ts8dkf5cmcKkeHr7J3G/pXZ4D6q3pA3E7/qD5Wv+Kb+cqs1R0w1ul9g81i2V38YFfzVu62s3/GeaGVIL8BPjKwCw==
+   eJy9klkKACAIRDtI97+a1+inQKJZhEoQIpfnWNFbi+nKomNf8UrNXp/zUZ/MYT0qfJe9x9C9uwOkj2lA3Ip+NJ+a38nNfGfX7hso1ul8g61q1b/4wWb7dv4t27mj4bUzQ3kD+D6xDg==
   </data>
  </layer>
- <objectgroup id="6" name="Mapevents" visible="0">
-  <object id="1" name="north1" type="mapchange" x="640" y="0" width="128" height="32">
+ <objectgroup name="Mapevents" visible="0">
+  <object name="north1" type="mapchange" x="640" y="0" width="128" height="32">
    <properties>
     <property name="map" value="elm_4f_1"/>
     <property name="place" value="south"/>
    </properties>
   </object>
-  <object id="2" name="north2" type="mapchange" x="96" y="0" width="256" height="32">
+  <object name="north2" type="mapchange" x="96" y="0" width="256" height="32">
    <properties>
     <property name="map" value="elm_4f_3"/>
     <property name="place" value="south"/>
    </properties>
   </object>
-  <object id="3" name="elm2f_trap" type="script" x="64" y="128" width="96" height="96">
+  <object name="elm2f_trap" type="script" x="64" y="128" width="96" height="96">
    <properties>
     <property name="when" value="round"/>
    </properties>
   </object>
-  <object id="4" name="elm2f_trap" type="script" x="416" y="0" width="96" height="96">
+  <object name="elm2f_trap" type="script" x="416" y="0" width="96" height="96">
    <properties>
     <property name="when" value="round"/>
    </properties>
   </object>
-  <object id="5" name="elm2f_trap" type="script" x="800" y="192" width="64" height="64">
+  <object name="elm2f_trap" type="script" x="800" y="192" width="64" height="64">
    <properties>
     <property name="when" value="round"/>
    </properties>
   </object>
-  <object id="6" name="elm2f_trap" type="script" x="608" y="192" width="96" height="96">
+  <object name="elm2f_trap" type="script" x="608" y="192" width="96" height="96">
    <properties>
     <property name="when" value="round"/>
    </properties>
   </object>
-  <object id="7" name="elm_golem" type="container" x="512" y="64" width="32" height="32"/>
+  <object name="elm_golem" type="container" x="512" y="64" width="32" height="32"/>
  </objectgroup>
- <objectgroup id="7" name="Spawn" visible="0">
-  <object id="8" name="elm4f2_monster1" type="spawn" x="384" y="160" width="192" height="128">
+ <objectgroup name="Spawn" visible="0">
+  <object name="elm4f2_monster1" type="spawn" x="384" y="160" width="192" height="128">
    <properties>
     <property name="quantity" value="3"/>
     <property name="spawngroup" value="elm_mine3"/>
    </properties>
   </object>
-  <object id="9" name="elm4f2_monster2" type="spawn" x="576" y="96" width="128" height="96">
+  <object name="elm4f2_monster2" type="spawn" x="576" y="96" width="128" height="96">
    <properties>
     <property name="quantity" value="4"/>
     <property name="spawngroup" value="elm_mine2"/>
    </properties>
   </object>
-  <object id="10" name="elm4f2_monster3" type="spawn" x="704" y="32" width="160" height="192">
+  <object name="elm4f2_monster3" type="spawn" x="704" y="32" width="160" height="192">
    <properties>
     <property name="ignoreAreas" value="true"/>
     <property name="quantity" value="4"/>
     <property name="spawngroup" value="elm_mine1"/>
    </properties>
   </object>
-  <object id="11" name="elm4f2_monster4" type="spawn" x="32" y="128" width="160" height="160">
+  <object name="elm4f2_monster4" type="spawn" x="32" y="128" width="160" height="160">
    <properties>
     <property name="ignoreAreas" value="true"/>
     <property name="quantity" value="3"/>
     <property name="spawngroup" value="elm_mine3"/>
    </properties>
   </object>
-  <object id="12" name="elm4f2_monster5" type="spawn" x="224" y="32" width="128" height="64">
+  <object name="elm4f2_monster5" type="spawn" x="224" y="32" width="128" height="64">
    <properties>
     <property name="quantity" value="2"/>
     <property name="spawngroup" value="elm_mine4"/>
    </properties>
   </object>
-  <object id="13" name="elm4f2_monster6" type="spawn" x="96" y="32" width="64" height="64">
+  <object name="elm4f2_monster6" type="spawn" x="96" y="32" width="64" height="64">
    <properties>
     <property name="quantity" value="2"/>
     <property name="spawngroup" value="elm_mine4"/>
    </properties>
   </object>
-  <object id="14" name="elm4f2_monster7" type="spawn" x="224" y="96" width="96" height="192">
+  <object name="elm4f2_monster7" type="spawn" x="224" y="96" width="96" height="192">
    <properties>
     <property name="quantity" value="3"/>
     <property name="spawngroup" value="elm_mine1"/>
    </properties>
   </object>
  </objectgroup>
- <objectgroup id="8" name="Keys"/>
- <objectgroup id="9" name="Replace"/>
+ <objectgroup name="Keys"/>
+ <objectgroup name="Replace"/>
 </map>
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/AndorsTrailApplication.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/AndorsTrailApplication.java
index e626b683c..14152991d 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/AndorsTrailApplication.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/AndorsTrailApplication.java
@@ -28,7 +28,7 @@ public final class AndorsTrailApplication extends Application {
 	public static final boolean DEVELOPMENT_FASTSPEED = false;
 	public static final boolean DEVELOPMENT_VALIDATEDATA = true;
 	public static final boolean DEVELOPMENT_DEBUGMESSAGES = true;
-	public static final String CURRENT_VERSION_DISPLAY = "0.7.17dev";
+	public static final String CURRENT_VERSION_DISPLAY = "0.7.17beta";
 	public static final boolean IS_RELEASE_VERSION = !CURRENT_VERSION_DISPLAY.matches(".*[a-d].*");
 	public static final boolean DEVELOPMENT_INCOMPATIBLE_SAVEGAMES = DEVELOPMENT_DEBUGRESOURCES || DEVELOPMENT_DEBUGBUTTONS || DEVELOPMENT_FASTSPEED || !IS_RELEASE_VERSION;
 	public static final int DEVELOPMENT_INCOMPATIBLE_SAVEGAME_VERSION = 999;