Populating charwood* and lodar* maps with monsters.

2026-01-20 02:21:11 +01:00 · 2013-06-10 01:17:43 +02:00
parent dcd8337ff3
commit 33b8d4fe3a
102 changed files with 4734 additions and 4278 deletions
--- a/AndorsTrail/res/raw/actorconditions_v070.json
+++ b/AndorsTrail/res/raw/actorconditions_v070.json
@@ -1,4 +1,22 @@
 [
+  {
+    "id": "slime",
+    "iconID": "actorconditions_1:56",
+    "name": "Corrosive Slime",
+    "category": 2,
+    "isStacking": 1,
+    "roundEffect": {
+      "visualEffectID": -1,
+      "increaseCurrentHP": {
+        "min": -1,
+        "max": -2
+      },
+      "increaseCurrentAP": {
+        "min": -1,
+        "max": -1
+      }
+    }
+  },
  {
    "id": "sense_1",
    "name": "Heightened senses",
--- a/AndorsTrail/res/raw/conversationlist_highwayman1.json
+++ b/AndorsTrail/res/raw/conversationlist_highwayman1.json
@@ -0,0 +1,90 @@
+[
+  {
+    "id": "highwayman1",
+    "replies": [
+      {
+        "text": "N",
+        "nextPhraseID": "highwayman1_2"
+      }
+    ],
+    "message": "Hold up. What have we here? A lone traveller on the Duleian road."
+  },
+  {
+    "id": "highwayman1_2",
+    "replies": [
+      {
+        "text": "N",
+        "nextPhraseID": "highwayman1_3"
+      }
+    ],
+    "message": "Haven't you heard, travelling this road can be dangerous."
+  },
+  {
+    "id": "highwayman1_3",
+    "replies": [
+      {
+        "text": "N",
+        "nextPhraseID": "highwayman1_4"
+      }
+    ],
+    "message": "There have been reports of people being robbed of all their possessions whilst travelling down this road."
+  },
+  {
+    "id": "highwayman1_4",
+    "replies": [
+      {
+        "requires": {
+          "item": {
+            "itemID": "gold",
+            "quantity": 500
+          }
+        },
+        "text": "Sounds good. Here is 500 gold.",
+        "nextPhraseID": "highwayman1_5"
+      },
+      {
+        "text": "Hey, that sounds like robbery to me!",
+        "nextPhraseID": "highwayman1_7"
+      },
+      {
+        "text": "How about I just kill you instead?",
+        "nextPhraseID": "highwayman1_6"
+      }
+    ],
+    "message": "Tell you what, if you give me .. shall we say .. 500 gold, I can almost guarantee that you won't be robbed on this road."
+  },
+  {
+    "id": "highwayman1_5",
+    "message": "Thank you. Have a pleasant day. Watch out for those robbers!"
+  },
+  {
+    "id": "highwayman1_6",
+    "replies": [
+      {
+        "text": "Fight!",
+        "nextPhraseID": "F"
+      }
+    ],
+    "message": "Oh, I see. You are trying to rob ME instead? Well then, I will not be so easily defeated. Prepare yourself."
+  },
+  {
+    "id": "highwayman1_7",
+    "replies": [
+      {
+        "requires": {
+          "item": {
+            "itemID": "gold",
+            "quantity": 500
+          }
+        },
+        "text": "Ok. Here is 500 gold.",
+        "nextPhraseID": "highwayman1_5"
+      },
+      {
+        "text": "How about I just kill you instead?",
+        "nextPhraseID": "highwayman1_6"
+      }
+    ],
+    "message": "Oh no no, are you accusing me of robbing you? That's not the case at all. I'm just asking for 500 gold so that you won't be robbed of all your possessions while travelling down this road."
+  }
+]
--- a/AndorsTrail/res/raw/conversationlist_lodarfg.json
+++ b/AndorsTrail/res/raw/conversationlist_lodarfg.json
@@ -96,11 +96,21 @@
    "replies": [
      {
        "text": "N",
-        "nextPhraseID": "lodar_fg1_8"
+        "nextPhraseID": "lodar_fg1_8a"
      }
    ],
    "message": "But once we got here, it started happening. One by one, my fellow guards got more and more .. well .. I don't know how to put it, but something started to happen to them."
  },
+  {
+    "id": "lodar_fg1_8a",
+    "replies": [
+      {
+        "text": "N",
+        "nextPhraseID": "lodar_fg1_8"
+      }
+    ],
+    "message": "Now, these flies that inhabit these woods can drive a grown man mad, I'll tell you that. But that wasn't it. There was something else."
+  },
  {
    "id": "lodar_fg1_8",
    "replies": [
@@ -129,13 +139,13 @@
        "nextPhraseID": "lodar_fg1_11"
      }
    ],
-    "message": "Another guard said he'd nearly gotten lost in a what he called 'the green maze'."
+    "message": "Another guard said he'd nearly gotten lost in a what he called the 'green maze'."
  },
  {
    "id": "lodar_fg1_11",
    "replies": [
      {
-        "text": "What could be causing it?",
+        "text": "What could be causing them to behave that way?",
        "nextPhraseID": "lodar_fg1_12"
      }
    ],
--- a/AndorsTrail/res/raw/conversationlist_lodarmobs.json
+++ b/AndorsTrail/res/raw/conversationlist_lodarmobs.json
@@ -0,0 +1,22 @@
+[
+  {
+    "id": "zortakb",
+    "replies": [
+      {
+        "text": "Fight!",
+        "nextPhraseID": "F"
+      }
+    ],
+    "message": "The Zortak will defeat you!"
+  },
+  {
+    "id": "lbridge",
+    "replies": [
+      {
+        "text": "Fight!",
+        "nextPhraseID": "F"
+      }
+    ],
+    "message": "You will not pass me."
+  }
+]
--- a/AndorsTrail/res/raw/conversationlist_v070signs1.json
+++ b/AndorsTrail/res/raw/conversationlist_v070signs1.json
@@ -24,5 +24,51 @@
    "id": "sign_rbfcr1_3",
    "message": "While examining them, you recall the the old man Ogam in Vilegard spoke of some 'Rocky Formations'. Could this be what he was referring to? If that is the case, you wonder if this path might lead to Lodar's hideaway.",
    "rewards": [ { "rewardID": "lodar", "value": 31 } ]
+  },
+  {
+    "id": "sign_rbfcr2",
+    "message": "North: Feygard\nSouth: Nor City"
+  },
+  {
+    "id": "sign_rbfcr6",
+    "message": "West: Feygard\nNorth: Charwood\nEast: Nor City"
+  },
+  {
+    "id": "sign_rbfcr8",
+    "message": "West: Feygard\nNorth: Charwood\nEast: Nor City"
+  },
+  {
+    "id": "sign_waytominto1",
+    "message": "West: Feygard\nNorth: Charwood\nSouth: Nor City"
+  },
+  {
+    "id": "sign_wdsetl0",
+    "replies": [
+      {
+        "text": "N",
+        "nextPhraseID": "sign_wdsetl0_1"
+      }
+    ],
+    "message": "Visitors are not welcome here!"
+  },
+  {
+    "id": "sign_wdsetl0_1",
+    "message": "(someone has scribbled a crude addition to the sign: Unless they bring the good stuff)"
+  },
+  {
+    "id": "sign_wdsetl0_grave1",
+    "message": "Here lies an unnamed visitor. May her items that we took serve us well."
+  },
+  {
+    "id": "sign_wdsetl0_grave2",
+    "message": "Here lies Khulrik. He always told us that he'd take one too many. Finally, he did."
+  },
+  {
+    "id": "sign_rbfcr6_grave1",
+    "message": "The text on the cross says: Here lies another Nor City savage bandit that roamed the Duelian road, easily slain by the glorious Feygard patrol."
+  },
+  {
+    "id": "sign_wlostmine2",
+    "message": "Welcome to beautiful Charwood heights!"
  }
 ]
--- a/AndorsTrail/res/raw/conversationlist_woodcabin.json
+++ b/AndorsTrail/res/raw/conversationlist_woodcabin.json
@@ -150,5 +150,9 @@
  {
    "id": "smuggler7_2",
    "message": "The Sakul are watching us. They're coming."
+  },
+  {
+    "id": "pig",
+    "message": "[grunt]"
  }
 ]
--- a/AndorsTrail/res/raw/droplists_v070_mobs.json
+++ b/AndorsTrail/res/raw/droplists_v070_mobs.json
@@ -145,12 +145,12 @@
      {
        "quantity": { "min": 1, "max": 1 },
        "itemID": "mace_iron",
-        "chance": 5
+        "chance": 1
      },
      {
        "quantity": { "min": 1, "max": 1 },
        "itemID": "broken_buckler",
-        "chance": 5
+        "chance": 1
      },
      {
        "quantity": { "min": 1, "max": 1 },
@@ -188,5 +188,390 @@
        "chance": 100
      }
    ]
+  },
+  {
+    "id": "highwayman1",
+    "items": [
+      {
+        "quantity": { "min": 1, "max": 20 },
+        "itemID": "gold",
+        "chance": 100
+      },
+      {
+        "quantity": { "min": 1, "max": 1 },
+        "itemID": "shirt_torn",
+        "chance": 100
+      },
+      {
+        "quantity": { "min": 1, "max": 1 },
+        "itemID": "mead",
+        "chance": 100
+      }
+    ]
+  },
+  {
+    "id": "vermin",
+    "items": [
+      {
+        "quantity": { "min": 0, "max": 1 },
+        "itemID": "gold",
+        "chance": 20
+      },
+      {
+        "quantity": { "min": 1, "max": 1 },
+        "itemID": "gem1",
+        "chance": 5
+      }
+    ]
+  },
+  {
+    "id": "jelly",
+    "items": [
+      {
+        "quantity": { "min": 0, "max": 2 },
+        "itemID": "gold",
+        "chance": 20
+      },
+      {
+        "quantity": { "min": 1, "max": 1 },
+        "itemID": "ring1",
+        "chance": 5
+      },
+      {
+        "quantity": { "min": 1, "max": 1 },
+        "itemID": "ring2",
+        "chance": 5
+      },
+      {
+        "quantity": { "min": 1, "max": 1 },
+        "itemID": "junk_necklace0",
+        "chance": 5
+      },
+      {
+        "quantity": { "min": 1, "max": 1 },
+        "itemID": "junk_necklace1",
+        "chance": 5
+      }
+    ]
+  },
+  {
+    "id": "jelly_b",
+    "items": [
+      {
+        "quantity": { "min": 5, "max": 30 },
+        "itemID": "gold",
+        "chance": 100
+      },
+      {
+        "quantity": { "min": 1, "max": 1 },
+        "itemID": "daggr_bloodlet",
+        "chance": 100
+      }
+    ]
+  },
+  {
+    "id": "mudfiend",
+    "items": [
+      {
+        "quantity": { "min": 0, "max": 2 },
+        "itemID": "gold",
+        "chance": 20
+      },
+      {
+        "quantity": { "min": 1, "max": 1 },
+        "itemID": "ring1",
+        "chance": 5
+      },
+      {
+        "quantity": { "min": 1, "max": 1 },
+        "itemID": "junk_necklace0",
+        "chance": 5
+      },
+      {
+        "quantity": { "min": 1, "max": 1 },
+        "itemID": "mudfiend",
+        "chance": 20
+      }
+    ]
+  },
+  {
+    "id": "oldcaveboss",
+    "items": [
+      {
+        "quantity": { "min": 5, "max": 30 },
+        "itemID": "gold",
+        "chance": 100
+      },
+      {
+        "quantity": { "min": 1, "max": 1 },
+        "itemID": "lleglaris",
+        "chance": 100
+      }
+    ]
+  },
+  {
+    "id": "cavebat",
+    "items": [
+      {
+        "quantity": { "min": 1, "max": 1 },
+        "itemID": "bat_wing",
+        "chance": 20
+      }
+    ]
+  },
+  {
+	"id": "anklebiter",
+	"items": [
+      {
+        "itemID": "gold",
+        "quantity": { "min": 0, "max": 5 },
+        "chance": 50
+      },
+      {
+        "itemID": "gem2",
+        "quantity": { "min": 1, "max": 1 },
+        "chance": 5
+      },
+      {
+        "itemID": "meat",
+        "quantity": { "min": 1, "max": 1 },
+        "chance": 10
+      },
+      {
+        "itemID": "hair",
+        "quantity": { "min": 1, "max": 1 },
+        "chance": 30
+      }
+	]
+  },
+  {
+    "id": "vscale",
+    "items": [
+      {
+        "itemID": "gold",
+        "quantity": { "min": 0, "max": 5 },
+        "chance": 30
+      },
+      {
+        "itemID": "meat",
+        "quantity": { "min": 1, "max": 1 },
+        "chance": 5
+      },
+      {
+        "itemID": "gland",
+        "quantity": { "min": 1, "max": 1 },
+        "chance": 5
+      },
+      {
+        "itemID": "venomscale",
+        "quantity": { "min": 1, "max": 1 },
+        "chance": 5
+      }
+    ]
+  },
+  {
+    "id": "vscaleb",
+    "items": [
+      {
+        "itemID": "gold",
+        "quantity": { "min": 5, "max": 20 },
+        "chance": 30
+      },
+      {
+        "itemID": "gland",
+        "quantity": { "min": 1, "max": 3 },
+        "chance": 20
+      },
+      {
+        "itemID": "venomscale",
+        "quantity": { "min": 1, "max": 3 },
+        "chance": 20
+      },
+      {
+        "itemID": "gloves3",
+        "quantity": { "min": 1, "max": 1 },
+        "chance": 5
+      },
+      {
+        "itemID": "gloves4",
+        "quantity": { "min": 1, "max": 1 },
+        "chance": 5
+      },
+      {
+        "itemID": "boots3",
+        "quantity": { "min": 1, "max": 1 },
+        "chance": 5
+      },
+      {
+        "itemID": "vscale_amul",
+        "quantity": { "min": 1, "max": 1 },
+        "chance": 1
+      }
+    ]
+  },
+  {
+    "id": "brtender",
+    "items": [
+      {
+        "itemID": "health",
+        "quantity": { "min": 1, "max": 1 },
+        "chance": 10
+      },
+      {
+        "itemID": "clmr_wrmas",
+        "quantity": { "min": 1, "max": 1 },
+        "chance": "1/1000"
+      }
+    ]
+  },
+  {
+    "id": "zortak",
+    "items": [
+      {
+        "itemID": "gold",
+        "quantity": { "min": 1, "max": 5 },
+        "chance": 30
+      },
+      {
+        "itemID": "health",
+        "quantity": { "min": 1, "max": 1 },
+        "chance": 10
+      },
+      {
+        "itemID": "hglv_irn",
+        "quantity": { "min": 1, "max": 1 },
+        "chance": 5
+      },
+      {
+        "itemID": "junk_necklace0",
+        "quantity": { "min": 1, "max": 1 },
+        "chance": 5
+      }
+    ]
+  },
+  {
+    "id": "zortakb",
+    "items": [
+      {
+        "itemID": "gold",
+        "quantity": { "min": 50, "max": 100 },
+        "chance": 100
+      },
+      {
+        "itemID": "health",
+        "quantity": { "min": 2, "max": 2 },
+        "chance": 100
+      },
+      {
+        "itemID": "blade_defiler",
+        "quantity": { "min": 1, "max": 1 },
+        "chance": 100
+      }
+    ]
+  },
+  {
+    "id": "lbridge",
+    "items": [
+      {
+        "itemID": "gold",
+        "quantity": { "min": 20, "max": 40 },
+        "chance": 100
+      },
+      {
+        "itemID": "pot_courage",
+        "quantity": { "min": 1, "max": 1 },
+        "chance": 5
+      },
+      {
+        "itemID": "graxe_shatter",
+        "quantity": { "min": 1, "max": 1 },
+        "chance": 100
+      },
+      {
+        "itemID": "health",
+        "quantity": { "min": 3, "max": 3 },
+        "chance": 100
+      }
+    ]
+  },
+  {
+    "id": "morkin",
+    "items": [
+      {
+        "itemID": "gold",
+        "quantity": { "min": 1, "max": 10 },
+        "chance": 30
+      },
+      {
+        "itemID": "pot_courage",
+        "quantity": { "min": 1, "max": 1 },
+        "chance": 5
+      },
+      {
+        "itemID": "health",
+        "quantity": { "min": 1, "max": 1 },
+        "chance": 10
+      },
+      {
+        "itemID": "clmr_dl",
+        "quantity": { "min": 1, "max": 1 },
+        "chance": 1
+      },
+      {
+        "itemID": "hvhead_irn",
+        "quantity": { "min": 1, "max": 1 },
+        "chance": 1
+      }
+    ]
+  },
+  {
+    "id": "khakin",
+    "items": [
+      {
+        "itemID": "gold",
+        "quantity": { "min": 1, "max": 5 },
+        "chance": 20
+      },
+      {
+        "itemID": "meat",
+        "quantity": { "min": 1, "max": 1 },
+        "chance": 10
+      },
+      {
+        "itemID": "khakin",
+        "quantity": { "min": 1, "max": 1 },
+        "chance": 5
+      }
+    ]
+  },
+  {
+    "id": "cryptmist",
+    "items": [
+      {
+        "itemID": "axe_fear",
+        "quantity": { "min": 1, "max": 1 },
+        "chance": 1
+      }
+    ]
+  },
+  {
+    "id": "hirathil",
+    "items": [
+      {
+        "itemID": "vial_empty1",
+        "quantity": { "min": 1, "max": 1 },
+        "chance": 5
+      },
+      {
+        "itemID": "gem1",
+        "quantity": { "min": 1, "max": 1 },
+        "chance": 5
+      },
+      {
+        "itemID": "scptr_runed",
+        "quantity": { "min": 1, "max": 1 },
+        "chance": 1
+      }
+    ]
  }
 ]
--- a/AndorsTrail/res/raw/itemlist_v070.json
+++ b/AndorsTrail/res/raw/itemlist_v070.json
@@ -1617,5 +1617,65 @@
    "category": "animal",
    "iconID": "items_misc:48",
    "baseMarketCost": 15
+  },
+  {
+    "id": "junk_necklace0",
+    "iconID": "items_jewelry:7",
+    "name": "Mundane necklace",
+    "category": "neck",
+    "equipEffect": {
+      "increaseAttackChance": 3
+    }
+  },
+  {
+    "id": "junk_necklace1",
+    "iconID": "items_jewelry:7",
+    "name": "Polished necklace",
+    "category": "neck",
+    "equipEffect": {
+      "increaseAttackChance": 4
+    }
+  },
+  {
+    "id": "bat_wing",
+    "iconID": "items_misc:46",
+    "name": "Bat wing",
+    "category": "animal",
+    "hasManualPrice": 1,
+    "baseMarketCost": 2
+  },
+  {
+    "id": "mudfiend",
+    "name": "Mudfiend goo",
+    "category": "animal",
+    "iconID": "items_misc_3:126",
+    "hasManualPrice": 1,
+    "baseMarketCost": 2
+  },
+  {
+    "id": "venomscale",
+    "name": "Venomscale scales",
+    "hasManualPrice": 1,
+    "category": "animal",
+    "iconID": "items_misc_3:115",
+    "baseMarketCost": 2
+  },
+  {
+    "id": "vscale_amul",
+    "name": "Venomscale amulet",
+    "displaytype": 4,
+    "category": "neck",
+    "equipEffect": {
+      "increaseCriticalSkill": 7
+    },
+    "iconID": "items_necklaces_1:13"
+  },
+  {
+    "id": "khakin",
+    "name": "Khakin eye",
+    "hasManualPrice": 1,
+    "category": "animal",
+    "iconID": "items_misc:45",
+    "baseMarketCost": 2
  }
 ]
--- a/AndorsTrail/res/raw/monsterlist_v070_charwood.json
+++ b/AndorsTrail/res/raw/monsterlist_v070_charwood.json
@@ -3,7 +3,7 @@
    "id": "forestfox2",
    "iconID": "monsters_rltiles4:4",
    "name": "Young forest fox",
-    "spawnGroup": "forestfox",
+    "spawnGroup": "forestfox2",
 	"droplistID": "mwolf",
    "monsterClass": 4,
    "maxHP": 31,
@@ -22,7 +22,7 @@
    "id": "forestfox3",
    "iconID": "monsters_rltiles4:4",
    "name": "Forest fox",
-    "spawnGroup": "forestfox",
+    "spawnGroup": "forestfox2",
 	"droplistID": "mwolf",
    "monsterClass": 4,
    "maxHP": 35,
@@ -94,6 +94,25 @@
      "max": 5
    }
  },
+  {
+    "id": "redft_cr",
+    "iconID": "monsters_rltiles4:10",
+    "name": "Vicious redfoot beast",
+	"droplistID": "oegyth1",
+    "monsterClass": 4,
+    "maxHP": 347,
+    "moveCost": 5,
+    "attackCost": 3,
+    "attackChance": 84,
+    "criticalSkill": 65,
+    "criticalMultiplier": 3,
+    "blockChance": 75,
+    "damageResistance": 4,
+    "attackDamage": {
+      "max": 9
+    },
+	"unique": 1
+  },
  {
    "id": "ccentip0",
    "iconID": "monsters_rltiles2:163",
--- a/AndorsTrail/res/raw/monsterlist_v070_lodar1cave.json
+++ b/AndorsTrail/res/raw/monsterlist_v070_lodar1cave.json
@@ -1,9 +1,10 @@
 [
  {
-    "id": "gnome_1",
+    "id": "mudfiend1",
    "iconID": "monsters_ld2:133",
    "name": "Mudfiend",
-    "spawnGroup": "gnome_1",
+    "spawnGroup": "mudfiend",
+    "droplistID": "mudfiend",
    "monsterClass": 3,
    "maxHP": 37,
    "moveCost": 5,
@@ -18,10 +19,11 @@
    }
  },
  {
-    "id": "gnome_2",
+    "id": "mudfiend2",
    "iconID": "monsters_ld2:133",
    "name": "Tough mudfiend",
-    "spawnGroup": "gnome_2",
+    "spawnGroup": "mudfiend",
+    "droplistID": "mudfiend",
    "monsterClass": 3,
    "maxHP": 41,
    "moveCost": 5,
--- a/AndorsTrail/res/raw/monsterlist_v070_lodar5cave.json
+++ b/AndorsTrail/res/raw/monsterlist_v070_lodar5cave.json
@@ -1,9 +1,10 @@
 [
  {
-    "id": "slirsdar_1",
+    "id": "caveburr1",
    "iconID": "monsters_rltiles2:161",
    "name": "Young posionous cave burrower",
-    "spawnGroup": "caveslir1",
+    "spawnGroup": "caveburr1",
+    "droplistID": "burrower",
    "monsterClass": 1,
    "maxHP": 57,
    "moveCost": 5,
@@ -25,10 +26,11 @@
    }
  },
  {
-    "id": "slirsdar_2",
+    "id": "caveburr2",
    "iconID": "monsters_rltiles2:161",
    "name": "Infected larval cave burrower",
-    "spawnGroup": "caveslir1",
+    "spawnGroup": "caveburr1",
+    "droplistID": "burrower",
    "monsterClass": 1,
    "maxHP": 62,
    "moveCost": 5,
@@ -50,10 +52,11 @@
    }
  },
  {
-    "id": "slirsdar_3",
+    "id": "caveburr3",
    "iconID": "monsters_rltiles2:164",
    "name": "Poisonous cave burrower",
-    "spawnGroup": "caveslir2",
+    "spawnGroup": "caveburr1",
+    "droplistID": "burrower",
    "monsterClass": 1,
    "maxHP": 65,
    "moveCost": 5,
@@ -81,10 +84,11 @@
    }
  },
  {
-    "id": "slirsdar_4",
+    "id": "caveburr4",
    "iconID": "monsters_rltiles2:164",
    "name": "Strong poisonous cave burrower",
-    "spawnGroup": "caveslir2",
+    "spawnGroup": "caveburr2",
+    "droplistID": "burrower",
    "monsterClass": 1,
    "maxHP": 67,
    "moveCost": 5,
@@ -112,10 +116,11 @@
    }
  },
  {
-    "id": "slirsdar_5",
+    "id": "caveburr5",
    "iconID": "monsters_rltiles2:165",
    "name": "Giant poisonous cave burrower",
-    "spawnGroup": "caveslir2",
+    "spawnGroup": "caveburr2",
+    "droplistID": "burrower",
    "monsterClass": 1,
    "maxHP": 69,
    "moveCost": 5,
@@ -143,10 +148,11 @@
    }
  },
  {
-    "id": "narg_1",
+    "id": "cavebat1",
    "iconID": "monsters_tometik4:0",
    "name": "Gray cave bat",
-    "spawnGroup": "cavenarg1",
+    "spawnGroup": "cavebat1",
+    "droplistID": "cavebat",
    "monsterClass": 4,
    "maxHP": 28,
    "moveCost": 5,
@@ -161,10 +167,11 @@
    }
  },
  {
-    "id": "narg_2",
+    "id": "cavebat2",
    "iconID": "monsters_tometik4:0",
    "name": "Black cave bat",
-    "spawnGroup": "cavenarg1",
+    "spawnGroup": "cavebat1",
+    "droplistID": "cavebat",
    "monsterClass": 4,
    "maxHP": 32,
    "moveCost": 5,
@@ -179,10 +186,11 @@
    }
  },
  {
-    "id": "narg_3",
+    "id": "cavebat3",
    "iconID": "monsters_tometik4:2",
    "name": "Brown cave bat",
-    "spawnGroup": "cavenarg2",
+    "spawnGroup": "cavebat1",
+    "droplistID": "cavebat",
    "monsterClass": 4,
    "maxHP": 36,
    "moveCost": 5,
@@ -197,10 +205,11 @@
    }
  },
  {
-    "id": "narg_4",
+    "id": "cavebat4",
    "iconID": "monsters_tometik4:2",
    "name": "Cave bat",
-    "spawnGroup": "cavenarg2",
+    "spawnGroup": "cavebat2",
+    "droplistID": "cavebat",
    "monsterClass": 4,
    "maxHP": 39,
    "moveCost": 5,
@@ -215,10 +224,11 @@
    }
  },
  {
-    "id": "narg_5",
+    "id": "cavebat5",
    "iconID": "monsters_tometik4:4",
    "name": "Aggressive cave bat",
-    "spawnGroup": "cavenarg3",
+    "spawnGroup": "cavebat2",
+    "droplistID": "cavebat",
    "monsterClass": 4,
    "maxHP": 41,
    "moveCost": 5,
--- a/AndorsTrail/res/raw/monsterlist_v070_lodarmaze.json
+++ b/AndorsTrail/res/raw/monsterlist_v070_lodarmaze.json
--- a/AndorsTrail/res/raw/monsterlist_v070_npcs.json
+++ b/AndorsTrail/res/raw/monsterlist_v070_npcs.json
@@ -173,5 +173,22 @@
    "name": "Two-teeth",
    "phraseID": "twoteeth",
    "iconID": "monsters_tometik7:40"
+  },
+  {
+    "id": "highwayman1",
+    "iconID": "monsters_men:8",
+    "name": "Highwayman",
+    "maxHP": 154,
+    "attackCost": 5,
+    "attackChance": 160,
+    "blockChance": 70,
+    "damageResistance": 4,
+    "droplistID": "highwayman1",
+    "phraseID": "highwayman1",
+    "attackDamage": {
+      "min": 2,
+      "max": 7
+    },
+    "unique": 1
  }
 ]
--- a/AndorsTrail/res/raw/monsterlist_v070_oldcave.json
+++ b/AndorsTrail/res/raw/monsterlist_v070_oldcave.json
@@ -1,9 +1,9 @@
 [
  {
-    "id": "hadar_1",
+    "id": "zombie1",
    "iconID": "monsters_tometik8:25",
    "name": "Rancid zombie",
-    "spawnGroup": "hadar_1",
+    "spawnGroup": "zombie2",
    "monsterClass": 6,
    "maxHP": 26,
    "moveCost": 5,
@@ -16,13 +16,14 @@
    "attackDamage": {
      "min": 4,
      "max": 7
-    }
+    },
+	"droplistID": "undead1"
  },
  {
-    "id": "hadar_2",
+    "id": "zombie2",
    "iconID": "monsters_tometik8:25",
    "name": "Rotting zombie",
-    "spawnGroup": "hadar_2",
+    "spawnGroup": "zombie2",
    "monsterClass": 6,
    "maxHP": 32,
    "moveCost": 5,
@@ -35,13 +36,14 @@
    "attackDamage": {
      "min": 5,
      "max": 8
-    }
+    },
+	"droplistID": "undead1"
  },
  {
-    "id": "hadar_3",
+    "id": "zombie3",
    "iconID": "monsters_tometik8:27",
    "name": "Blighted zombie",
-    "spawnGroup": "hadar_3",
+    "spawnGroup": "zombie2",
    "monsterClass": 6,
    "maxHP": 49,
    "moveCost": 5,
@@ -54,13 +56,13 @@
    "attackDamage": {
      "min": 7,
      "max": 10
-    }
+    },
+	"droplistID": "undead1"
  },
  {
-    "id": "hadar_4",
+    "id": "oldcaveboss",
    "iconID": "monsters_tometik1:78",
    "name": "Dread zombie",
-    "spawnGroup": "hadar_4",
    "monsterClass": 6,
    "maxHP": 95,
    "moveCost": 5,
@@ -86,13 +88,15 @@
          "chance": 30
        }
      ]
-    }
+    },
+    "unique": 1,
+	"droplistID": "oldcaveboss"
  },
  {
-    "id": "morphrang_1",
+    "id": "zombie5",
    "iconID": "monsters_zombie2:0",
    "name": "Corrupted zombie",
-    "spawnGroup": "morphrang_1",
+    "spawnGroup": "zombie3",
    "monsterClass": 6,
    "maxHP": 42,
    "moveCost": 5,
@@ -103,13 +107,14 @@
    "attackDamage": {
      "min": 2,
      "max": 9
-    }
+    },
+	"droplistID": "undead1"
  },
  {
-    "id": "morphrang_2",
+    "id": "zombie6",
    "iconID": "monsters_zombie2:0",
    "name": "Bloodthirsty zombie",
-    "spawnGroup": "morphrang_2",
+    "spawnGroup": "zombie3",
    "monsterClass": 6,
    "maxHP": 54,
    "moveCost": 5,
@@ -120,15 +125,16 @@
    "attackDamage": {
      "min": 2,
      "max": 9
-    }
+    },
+	"droplistID": "undead1"
  },
  {
-    "id": "morphrang_3",
+    "id": "zombie7",
    "iconID": "monsters_zombie2:0",
    "name": "Tainted zombie",
-    "spawnGroup": "morphrang_3",
+    "spawnGroup": "zombie4",
    "monsterClass": 6,
-    "maxHP": 57,
+    "maxHP": 87,
    "moveCost": 5,
    "attackCost": 5,
    "attackChance": 137,
@@ -137,6 +143,7 @@
    "attackDamage": {
      "min": 3,
      "max": 9
-    }
+    },
+	"droplistID": "undead1"
  }
 ]
--- a/AndorsTrail/res/raw/monsterlist_v070_roadcave.json
+++ b/AndorsTrail/res/raw/monsterlist_v070_roadcave.json
@@ -26,7 +26,8 @@
          "chance": 40
        }
      ]
-    }
+    },
+    "droplistID": "jelly"
  },
  {
    "id": "jelly2",
@@ -54,7 +55,8 @@
          "chance": 40
        }
      ]
-    }
+    },
+    "droplistID": "jelly"
  },
  {
    "id": "jelly3",
@@ -83,7 +85,8 @@
          "chance": 40
        }
      ]
-    }
+    },
+    "droplistID": "jelly"
  },
  {
    "id": "jelly4",
@@ -110,7 +113,8 @@
          "chance": 40
        }
      ]
-    }
+    },
+    "droplistID": "jelly"
  },
  {
    "id": "jelly5",
@@ -139,6 +143,38 @@
          "chance": 40
        }
      ]
-    }
+    },
+    "droplistID": "jelly"
+  },
+  {
+    "id": "jelly6",
+    "iconID": "monsters_tometik2:2",
+    "name": "Emerald Ooze",
+    "spawnGroup": "jelly_b",
+    "monsterClass": 3,
+    "maxHP": 131,
+    "moveCost": 5,
+    "attackCost": 5,
+    "attackChance": 115,
+    "criticalSkill": 10,
+    "criticalMultiplier": 2,
+    "blockChance": 70,
+    "damageResistance": 7,
+    "attackDamage": {
+      "min": 8,
+      "max": 12
+    },
+    "hitEffect": {
+      "conditionsTarget": [
+        {
+          "condition": "slime",
+          "magnitude": 3,
+          "duration": 5,
+          "chance": 40
+        }
+      ]
+    },
+    "unique": 1,
+    "droplistID": "jelly_b"
  }
 ]
--- a/AndorsTrail/res/raw/monsterlist_v070_slime.json
+++ b/AndorsTrail/res/raw/monsterlist_v070_slime.json
@@ -1,20 +0,0 @@
-[
-  {
-    "id": "slime",
-    "iconID": "actorconditions_1:56",
-    "name": "Corrosive Slime",
-    "category": 2,
-    "isStacking": 1,
-    "roundEffect": {
-      "visualEffectID": -1,
-      "increaseCurrentHP": {
-        "min": -1,
-        "max": -2
-      },
-      "increaseCurrentAP": {
-        "min": -1,
-        "max": -1
-      }
-    }
-  }
-]
--- a/AndorsTrail/res/raw/questlist_v070_lowyna.json
+++ b/AndorsTrail/res/raw/questlist_v070_lowyna.json
@@ -31,12 +31,7 @@
      },
      {
        "progress": 15,
-        "logText": "The amulet can be found in a cave to the east of his cabin. He said something about the ground having been corrupted around that cave. I don't know what he meant."
-      },
-      {
-        "progress": 20,
-        "logText": "I have found the cave that Lleglaris mentioned.",
-        "rewardExperience": 500
+        "logText": "The amulet can be found in a cave infested with undead to the east of his cabin. He said something about the ground having been corrupted around that cave. I don't know what he meant."
      },
      {
        "progress": 30,
--- a/AndorsTrail/res/values/loadresources.xml
+++ b/AndorsTrail/res/values/loadresources.xml
@@ -219,6 +219,8 @@
    	<item>@raw/conversationlist_v070signs1</item>
    	<item>@raw/conversationlist_v070signs2</item>
    	<item>@raw/conversationlist_woodcabin</item>
+    	<item>@raw/conversationlist_highwayman1</item>
+    	<item>@raw/conversationlist_lodarmobs</item>
    </array>

    <array name="loadresource_monsters">
@@ -244,7 +246,6 @@
    	<item>@raw/monsterlist_v070_lodarnpcs</item>
    	<item>@raw/monsterlist_v070_oldcave</item>
    	<item>@raw/monsterlist_v070_roadcave</item>
-    	<item>@raw/monsterlist_v070_slime</item>
    	<item>@raw/monsterlist_v070_npcs</item>
    </array>
    
--- a/AndorsTrail/res/xml/lodar0.tmx
+++ b/AndorsTrail/res/xml/lodar0.tmx
@@ -130,7 +130,7 @@
 </layer>
 <layer name="Objects" width="30" height="30">
  <data encoding="base64" compression="zlib">
-   eJyNVs1u00AQXhepp7VkK1zCDS48CD21vABcuMMZJB6DR+NQKjWxmiIkpJJEJbkBtdipd9rPn2fsjLTaZD3/883szssQ5rDOqhDeHIdw6qz3aS1jCLeJ73daQru0H9X+LnzCj+dzw+6H406f6sb9eeJ5kVZI8kXd7WxLz3lHPs+u+scy8v887d+qLu6jcqiTfZX9Kvb53HjrYY7E5jrJX8bwQH/T7yba8aHPrGcq3l7ugPSb0q/si/j1D/yyfJplW18KP160KfxNtL/9AFuWX1f0/ZB4Tcq+b5K+uziOa8xHG7ucnFb99dqIl3UoLZL853LcJsots+06yTyjNYVnzu/ayrvDrzFvo2/XwiH7X5f9eorunwa/nJ9k3lXV6Z6K14sD8a3/v1bDPCHfTXzE11S8qPMEZsR9jgs7L8K/yjNUe2BD2HPthr6/L8tuRmB8y8LGlJDgrYA6qD7l8+yKfyo3yzv27vdqqAtrgdRC707FK5iReiyp3zHeluKXvrqohr68KrOfcM79+w7yvIlDW5r7a/1G9WX837Mkuyuqr3fHPsm5vYPcMjVke2xmoM2dcb/q/hR8ZBm+I/7EadssPzZnhBbGPFpQzoQ+0VtgbG6JPN7VOkuQZw25lP83hCWswSXhEPtd+bf5O55J/fdUT821YHdLNh/eWLVdR5VTnxuQ994mjIlbsrkBfdb8ZvmWanMoFvj9JD3p3Rncc4yHXTWOgUNwacnjnce5N/MwYtvSrfUSPM0Az40RH++Dt4jjvxDWFN9TivE1xuj0kJ5bses9oDbkLv9YdjW1cndRPZ6J760zxxAPVh9KvwgW9vQm5dx5s6Yop3OtfvCdPmVL9n0cvmu9ecw+WjkQnrdOj3jz/JDeQ77/gOpusA==
+   eJyNV81u00AQXhepp7VkK1zCDS48CD2VvgBcuMMZJB6DR+NQkJpYDagSUptEJbkBtdipd9rPn2fsjLTaZj3/883sdl6GMIf1ugrhzXEIp856n9YyhnCb+H6nJbRL+1Ht78In/Hg+N+x+OO70qW7cnyeeF2mFJF/U3c629Jx35PPsqn8sI7/P0/6t6uI+Koc62VfZL2Ofz423HuZIbK6T/EUMD/Q3/d1EOz70mfVMxdvLHZB+U7rJvohf/8Avy6dZtvWl8ONFm8LfRPvbFdiy/Lqk74fEa1L2fZP03cVxXGM+2tjl5LTqrzMjXtahtEjyn8txmyi3zLbrJPOM1hSeOb9rK+8Ov8a8jb5dC4fsf1326ym6fxn8cn6SeVdVp3sqXi8OxLf+/loN84R81/ERX1Pxos4TmBH3OS7svAj/Ks9Q7YENYc+1G/r+viy7GYHxLQsbU0KCtwLqoPqUz7Mr/qncLO/Yuz+roS6sBVILvTsVr2BG6rGkfsd4W4pf+up7NfTlVZn9hHPu33eQ500c2tLc/9BvVF/G/z1Lsrui+np37JOc2zvILVNDtsdmBtrcGfer7k/BR5bhO+JPnLbN8mNzRmhhzKMF5UzoE70FxuaWyONdrbMEedaQS/l9TVjCGlwQDrHflX+bv+OZ1H9P9dRcC3a3ZPPhjVXbdVQ59bkBee9twpi4JZsb0GfNb5ZvqTaHYoHfT9KT3p3BPcd42FXjGDgEl5Y83nmcezMPI7Yt3VovwdMM8NwY8fE+eIs4/gthTfE9pRhfY4xOD+m5FbveA2pD7vKPZVdTK3cyk3Vuiu8t9J73f4PVh9IvgoU9vUk5d96sKcrpXKsffKdP2ZJ9H4fvWm8es49WDoTnrdMj3jw/pPeQ7z/6pW+d
  </data>
 </layer>
 <layer name="Above" width="30" height="30">
@@ -140,7 +140,7 @@
 </layer>
 <layer name="Walkable" width="30" height="30">
  <data encoding="base64" compression="zlib">
-   eJztUkEOgDAI2xP81P7/JeNhCTEbtAU5SUKMOlradV5jzL+hfqqTa1ddnNEeVTut+R2Ox2Xf2V0iDRFWhQeql1leRmf2fMX+FZwsVtZfO4fgrP/vZ9bTE/epFB93sx6Wyu2Vcr/sXXrYyv6ZvKreKXmq0KHkyvuu6GG5Uf3ozkgmoploR8YXe5bxsiMHak6+5IruOeuhqg/JDJI5RYOXoQi7itvyM1hV3OxsNr/qHNo36KDgdQ==
+   eJztUkEOgDAI2xP81P7/JeNhCTEbtAU5SUKMOlradV5jzL+hfqqTa1ddnNEeVTut+R2Ox2Xf2V0iDRFWhQeql1leRmf2fMX+FZwsVtZfO4fgrP/vZ9bTE/epFB93sx6Wyu2Vcr/sXXrYyv6ZvKreKXmq0KHkyvuu6GG5Uf3ozkgmoploR8YXe5bxsiMHak6+5IruOeuhqg/JDJI5RYOXIQS7gtvyM1hV3OxsNr/qHNo3cBfgyg==
  </data>
 </layer>
 <objectgroup name="Mapevents" width="30" height="30">
@@ -169,86 +169,55 @@
   </properties>
  </object>
 </objectgroup>
- <objectgroup name="Spawn" width="30" height="30" visible="0">
+ <objectgroup name="Spawn" width="30" height="30">
+  <object name="forestfly1" type="spawn" x="64" y="768" width="32" height="64">
+   <properties>
+    <property name="quantity" value="2"/>
+   </properties>
+  </object>
+  <object name="lodar0_g" type="spawn" x="576" y="800" width="32" height="32"/>
  <object name="forestfly1" type="spawn" x="128" y="832" width="32" height="64">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
  </object>
-  <object name="forestregral1" type="spawn" x="64" y="768" width="32" height="64">
-   <properties>
-    <property name="quantity" value="2"/>
-   </properties>
-  </object>
-  <object name="forestregral1" type="spawn" x="256" y="800" width="192" height="96">
-   <properties>
-    <property name="quantity" value="2"/>
-   </properties>
-  </object>
-  <object name="forestfly3" type="spawn" x="384" y="768" width="192" height="128">
-   <properties>
-    <property name="quantity" value="2"/>
-   </properties>
-  </object>
-  <object name="forestregral1" type="spawn" x="576" y="800" width="192" height="128">
-   <properties>
-    <property name="quantity" value="2"/>
-   </properties>
-  </object>
-  <object name="forestregral1" type="spawn" x="736" y="736" width="96" height="32"/>
-  <object name="forestwesral1" type="spawn" x="864" y="640" width="32" height="64">
-   <properties>
-    <property name="quantity" value="2"/>
-   </properties>
-  </object>
-  <object name="forestfly2" type="spawn" x="608" y="608" width="192" height="96">
-   <properties>
-    <property name="quantity" value="2"/>
-   </properties>
-  </object>
-  <object name="forestregral1" type="spawn" x="416" y="512" width="224" height="160">
-   <properties>
-    <property name="quantity" value="2"/>
-   </properties>
-  </object>
-  <object name="forestwesral1" type="spawn" x="224" y="512" width="192" height="192">
+  <object name="forestfly1" type="spawn" x="256" y="768" width="288" height="160">
   <properties>
    <property name="quantity" value="3"/>
   </properties>
  </object>
-  <object name="forestwesral2" type="spawn" x="192" y="352" width="224" height="288">
+  <object name="forestfly1" type="spawn" x="640" y="672" width="288" height="256">
   <properties>
-    <property name="quantity" value="4"/>
+    <property name="quantity" value="3"/>
   </properties>
  </object>
-  <object name="forestfly2" type="spawn" x="480" y="480" width="32" height="32"/>
-  <object name="forestregral1" type="spawn" x="480" y="416" width="32" height="32"/>
-  <object name="forestfly1" type="spawn" x="448" y="256" width="128" height="160">
+  <object name="forestfly1" type="spawn" x="448" y="256" width="96" height="224">
+   <properties>
+    <property name="quantity" value="3"/>
+   </properties>
+  </object>
+  <object name="hanklbit1" type="spawn" x="480" y="480" width="32" height="32"/>
+  <object name="hanklbit1" type="spawn" x="192" y="352" width="224" height="192">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
  </object>
-  <object name="forestwesral1" type="spawn" x="288" y="64" width="416" height="256">
+  <object name="forestfly1" type="spawn" x="288" y="96" width="416" height="160">
   <properties>
-    <property name="quantity" value="5"/>
+    <property name="quantity" value="3"/>
   </properties>
  </object>
-  <object name="forestregral1" type="spawn" x="768" y="128" width="32" height="64">
+  <object name="forestfly1" type="spawn" x="672" y="192" width="256" height="320">
+   <properties>
+    <property name="quantity" value="3"/>
+   </properties>
+  </object>
+  <object name="forestfly1" type="spawn" x="480" y="512" width="320" height="160">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
  </object>
-  <object name="forestfly3" type="spawn" x="832" y="160" width="96" height="160">
-   <properties>
-    <property name="quantity" value="2"/>
-   </properties>
-  </object>
-  <object name="forestwesral1" type="spawn" x="672" y="320" width="256" height="224">
-   <properties>
-    <property name="quantity" value="2"/>
-   </properties>
-  </object>
-  <object name="forestregral1" type="spawn" x="640" y="320" width="288" height="224">
+  <object name="forestfly1" type="spawn" x="288" y="544" width="192" height="160">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
--- a/AndorsTrail/res/xml/lodar1.tmx
+++ b/AndorsTrail/res/xml/lodar1.tmx
@@ -1,128 +1,127 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="17" height="11" tilewidth="32" tileheight="32">
 <properties>
  <property name="outside" value="1"/>
 </properties>
 <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="576" height="192"/>
 </tileset>
 <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="576" height="192"/>
 </tileset>
 <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="576" height="192"/>
 </tileset>
 <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="480" height="256"/>
 </tileset>
 <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="480" height="256"/>
 </tileset>
 <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="512" height="256"/>
 </tileset>
 <layer name="Ground" width="17" height="11">
  <data encoding="base64" compression="zlib">
@@ -131,7 +130,7 @@
 </layer>
 <layer name="Objects" width="17" height="11">
  <data encoding="base64" compression="zlib">
-   eJyVUsENwjAMPPp2RTMTLMMAPBiBjVijX2jFE6lIiPJEPLCTpnWsRIiTrFOcu9hOAgesOGD42QAvjsr95lsT9KNh2bdnR59dl+qJridgX8PjREu+zfhyswwUvI+Jo34s+Sf0hASfuM7MkTDjzNrjGuhMTcGdwp1p/YVzm3qpVam89utzfCvs2XFslXfWOKUtvHOcUfodVK2ouar7Fs2b46BqWfh+XXq/SR8Kpf+U2//nP5b4C80ETcc=
+   eJyVUkEKAjEMHPfcxe2b9DM+wINP8Ed+Y6/q4lFYQVyP4sGkbdw0tIgDYUg60ySl8MCCAoYfHfCkaPxvvnZRPxnmc3u3+Gxe68e6wQHbFgEHN9f7gq+0y+ii955Y9FPNnzA4ZHhLXtgjY8KRtPslcDY9GTcX30zrT1RbtXOvRtW1X98TRiHPhmKtvF9NmrPXvQzLjjzvqHqJ5qLemzUvip3qZRHm9fn7Sm5R+0+l83/+Y40/tQtOqA==
  </data>
 </layer>
 <layer name="Above" width="17" height="11">
@@ -141,7 +140,7 @@
 </layer>
 <layer name="Walkable" width="17" height="11">
  <data encoding="base64" compression="zlib">
-   eJxzFWBgcB3kGBlQqp8YMwgBSuzEZgYuO/DZSapaUvxKbriQqp+QOmqnIwCoISsr
+   eJxzFWBgcB3kGBlQqp8YMwgBSuzEZgYuO/DZSYpaUv1KbriQqp+QOmqnIwD/uSuA
  </data>
 </layer>
 <objectgroup name="Mapevents" width="17" height="11">
@@ -159,31 +158,12 @@
  </object>
 </objectgroup>
 <objectgroup name="Spawn" width="17" height="11">
-  <object name="forestfly3" type="spawn" x="384" y="160" width="96" height="160">
+  <object name="forestfly1" type="spawn" x="128" y="64" width="352" height="256">
   <properties>
-    <property name="quantity" value="2"/>
-   </properties>
-  </object>
-  <object name="forestregral1" type="spawn" x="64" y="256" width="224" height="64">
-   <properties>
-    <property name="quantity" value="2"/>
-   </properties>
-  </object>
-  <object name="forestwesral2" type="spawn" x="256" y="192" width="160" height="128">
-   <properties>
-    <property name="quantity" value="3"/>
-   </properties>
-  </object>
-  <object name="forestregral1" type="spawn" x="192" y="64" width="128" height="128">
-   <properties>
-    <property name="quantity" value="2"/>
-   </properties>
-  </object>
-  <object name="forestfly3" type="spawn" x="128" y="128" width="32" height="64">
-   <properties>
-    <property name="quantity" value="2"/>
+    <property name="quantity" value="5"/>
   </properties>
  </object>
+  <object name="mudfiend" type="spawn" x="32" y="128" width="96" height="96"/>
 </objectgroup>
 <objectgroup name="Keys" width="17" height="11" visible="0"/>
 </map>
--- a/AndorsTrail/res/xml/lodar10.tmx
+++ b/AndorsTrail/res/xml/lodar10.tmx
@@ -138,7 +138,7 @@
   eJzFlE0SRUAMhJm1hTmdG3AO5bZWOMGrUVT1RH4mFK83imS+tCRUFa+1FQJ/1NJ+5wtrfVm3RG/60diDs2ZibXAmxDzeOXiUdaoGZuKd/q0ecSyqYn/RTuF4d2Y4Bpl3lyPx0B/tJ3fe4iHLq7R7PeMPWaX9zFjx2CG40hqWtDlM4cr08qgHLzPj0fdFZqGkXPoc762ZS/+WxMCzA8y8VnqgzQRr7XkHR5u1xusIb26e+cMY9lD65nCffzYdNeU=
  </data>
 </layer>
- <layer name="Walkable" width="20" height="25" visible="0">
+ <layer name="Walkable" width="20" height="25">
  <data encoding="base64" compression="zlib">
   eJxzFWBgcB3CGAaoYQbMHErNRDeHGu7D5lZizMWmDt08csOKGuFFCFAjTpHdSUpYE5NWiLWbFL+TYxYpYUoNcyiNF3zpk1yzKDWPWDuoYeZgdB+t/Ept/1LTfcMNAwDewIfO
  </data>
@@ -157,33 +157,14 @@
   </properties>
  </object>
 </objectgroup>
- <objectgroup name="Spawn" width="20" height="25" visible="0">
-  <object name="xalirg_3" type="spawn" x="320" y="320" width="224" height="96">
+ <objectgroup name="Spawn" width="20" height="25">
+  <object name="khakin1" type="spawn" x="64" y="224" width="416" height="480">
   <properties>
-    <property name="quantity" value="2"/>
+    <property name="quantity" value="5"/>
   </properties>
  </object>
-  <object name="undeadcr3" type="spawn" x="224" y="448" width="96" height="256">
-   <properties>
-    <property name="quantity" value="3"/>
-   </properties>
-  </object>
-  <object name="slargrum_9" type="spawn" x="96" y="320" width="96" height="192">
-   <properties>
-    <property name="quantity" value="2"/>
-   </properties>
-  </object>
-  <object name="zortak_4" type="spawn" x="64" y="320" width="256" height="192">
-   <properties>
-    <property name="quantity" value="2"/>
-   </properties>
-  </object>
-  <object name="xalirg_4" type="spawn" x="32" y="192" width="224" height="128">
-   <properties>
-    <property name="quantity" value="3"/>
-   </properties>
-  </object>
-  <object name="slargrum_10" type="spawn" x="224" y="64" width="160" height="160"/>
+  <object name="khakin1" type="spawn" x="320" y="384" width="64" height="32"/>
+  <object name="morkins" type="spawn" x="224" y="64" width="160" height="160"/>
 </objectgroup>
 <objectgroup name="Keys" width="20" height="25"/>
 </map>
--- a/AndorsTrail/res/xml/lodar11.tmx
+++ b/AndorsTrail/res/xml/lodar11.tmx
@@ -128,17 +128,17 @@
   eJzdltENwjAMRFE/YFbWYAXaEWhHKAyAkDoVRMTCOs52QigffJyqplWe7TiX9N1m01dqeOi6femYx4/G/9b4v3JPX+JOldw5s8f8PsL3g5LHvBhcL6/EPj+03z2f1hqkWt6272PI1Nw5YC+Zu3zARWaSZumaak2N+TIu5ik11bqskK9mS88sIJkjcaO+ZX1mcYV9JnW25i/Z10MBN2khdbZ6rYbr1Rr5IqvP1+CyNUAOi2XKPZB0yu8tXL3PrT0nniTcOb9LPDif7r+DExerq+4FYQjX8ys2lxWDtZ6419gaYw5RX+g4Sv7tO+51JfG3SPwUvW5NrvQVel1LjVFsDdlZV9KbyKnJtXR/Mm5r3VldvDO3hRvVBuvAPDfi6vsVsti5K4o817vjWPeNEi5j62/eHce6b3zSd5Hfou/2nX/fKM058tvId2u4Ub4t+gX3DroBPZw=
  </data>
 </layer>
- <layer name="Objects" width="30" height="30" visible="0">
+ <layer name="Objects" width="30" height="30">
  <data encoding="base64" compression="zlib">
   eJyVV01uEzEU9oStR5ooJ4ANB2nv0EXPwaKIUqGsiMSCLkAgLsBJ2FIkiEQSNdBKldrO0JRd2xT81e+L37xxqPikkTNj+/1+79m5rJzr9Z27/I+xCOPEuztMZdwO3y+q7vp133MyXT+NOd2LKuo6F52QC/m59fY75eZkQs5C2WltwPtcdP72cW57zfptsZG+NGF97dOap2H+mXp2K+W3MzIDZj7NQ472a6F0jfg74FRs3SnjHujcU34Cz0V3x2/BmXctjJQuG7fXvThVF2E66HxXRL9t7hdGhv2+32vHDmi0HZl90L0M+s7DMypivHKcWFRdHkIHdIJPjfEXoF8tm5Rt0DsNz/sixivHiRyfYctGmTjViY/R/auIMSWW8vtC1mt/kW/W5qGPeSbPYMuglNwqm6CLurEf74jln/B8CM/LIsYJc6eyV3OK/m4G2Q/D86hMtpJntYqvzgF118q/g/C+lPXHGR7qPAJvuNfUxaswboXnxvirdTOWjYkxgN72Q/aeZmQAiCW416lJgd2HOJ1UMVbQfxv2fqpivIlrn2p4BdvLXOTeRPUH1iNjB45pvoJvrOuPYW5cxf2aa1gz8+1eoGUA4EPtu/MPysQ99mj48VNigt5wI9+fCEe0buTRxk+DfcViU/HthchjLMD3oXAXvIL/c1XvheyF/bRF84A9CfnB/L7uCS7Gel4lnbaWByJ/yB7pk82IzZGPMaHut1JrtBWYib2oZ8xdSR7ha+5sJUd2yrTfQueTNk3VurnJo0auj5IDE5/2wmbk/Frx7sjIuzLvdzmWngp8V/y2NXAhdUJO2bNVP5QB3vXLbn3BJ9QiRuYYudMxxv5r39Wzp/Jv7xME4nKi3vczuYP8sZwNtsfZM9zeWWz+Cfp5IH59UbHgCF6t7gYmxrbf3jfaPOyKLfR9Ivch1IO+29xBfuP7+Zqebc9VjjoPAM8dcgRgn6h9+y4EkEMDnsuZXs+eMSwy/dlwiWBNoTduqdiz3jfK9l2rzpwX/wLtq00sWdMch73ufU3bB5wpGRuqp36uYi/BXSCXD8Zax2olz7nO+THI9P7GnL3gKvoq45y7tx+vyRN6+opDAV/D3DfFv0b121vROypS3fNMACdy/pI/6/4T4Tw/tHF1iWOPy9j3eLehj+yb6FFWNmOW85dA76gNl8aKi/3S3Yu/fteILg==
  </data>
 </layer>
- <layer name="Above" width="30" height="30" visible="0">
+ <layer name="Above" width="30" height="30">
  <data encoding="base64" compression="zlib">
   eJy9VssNwjAMLTmDFKbrBu0cqFMwEHBFLMAK7QY0RRGOiX8h4V3cNp/n2M9Ou64MvdfNW5TzSnmp/XfH+ryz//BR+0vn3dYdkRV4NZD2Obn0fXLv8+Qwrt8HdF4NRp9aaV6OswQxRlKscuPwm/W8NXipHHAYGF7o/zYOtEatccZaifxYUxEwjpNLefF5Ldy5WHH5CpqaCB8Dfu0RFHevrIOA86GMg+Ol9Pio3Iu1vDUAYxmfcR3cG/DDnjQgH6R+pekn1vuxZYwlXmt/xJiFPXL1UnonJGDqHOZxAfZm4KX6oIZTg+iXlQfjH9rBuX3u23MGhF4O48P1fU1fxpB0D3U9EhrnfNIA+r349D4M7/CO5fy16EijVfwvibmj35fVXpWx19YHzuXX/08jcHvnxiz9xMIbdZDLP7YR1HiwL4h3ZGk=
  </data>
 </layer>
- <layer name="Walkable" width="30" height="30" visible="0">
+ <layer name="Walkable" width="30" height="30">
  <data encoding="base64" compression="zlib">
   eJzFUtsJACEMc4Rbyv1Xuq8DEdvmoV5AEEqbJk1/WuvCG6H0q+9vXqXP5XU92jGD3fe2Xw7vjBu8bo4z3mqmk8ksUwgvyp2B9VHRO8+M9GbcVc3JY1Zf1aKZkZ9qflbI7snyonqR/XbxMpla9UYzHK+qzEb/FRiPKzAZr7KG8M39jA4m32jelKf0MzsqPpzU7O58gjPLlqMX6R1rM6erF52x6x7j/rezgHrt3BPNTYUdehkvP7xCcd4i
  </data>
@@ -199,87 +199,57 @@
   </properties>
  </object>
 </objectgroup>
- <objectgroup name="Spawn" width="30" height="30" visible="0">
-  <object name="werewolf_1" type="spawn" x="224" y="416" width="32" height="32"/>
-  <object name="forestregral2" type="spawn" x="448" y="96" width="96" height="96">
-   <properties>
-    <property name="quantity" value="2"/>
-   </properties>
-  </object>
-  <object name="slargrum_1" type="spawn" x="32" y="512" width="64" height="64"/>
-  <object name="urdom_1" type="spawn" x="32" y="576" width="96" height="160">
+ <objectgroup name="Spawn" width="30" height="30">
+  <object name="hanklbit1" type="spawn" x="448" y="96" width="32" height="32"/>
+  <object name="hanklbit1" type="spawn" x="448" y="160" width="32" height="32"/>
+  <object name="forestfly2" type="spawn" x="384" y="352" width="128" height="288">
   <properties>
    <property name="quantity" value="3"/>
   </properties>
  </object>
-  <object name="forestregral2" type="spawn" x="128" y="544" width="96" height="96"/>
-  <object name="slargrum_1" type="spawn" x="224" y="512" width="128" height="64">
-   <properties>
-    <property name="quantity" value="2"/>
-   </properties>
-  </object>
-  <object name="werewolf_1" type="spawn" x="224" y="416" width="32" height="32"/>
-  <object name="forestregral2" type="spawn" x="128" y="256" width="96" height="96"/>
-  <object name="urdom_1" type="spawn" x="96" y="256" width="192" height="160">
-   <properties>
-    <property name="quantity" value="2"/>
-   </properties>
-  </object>
-  <object name="forestregral2" type="spawn" x="384" y="480" width="96" height="160">
+  <object name="forestfly1" type="spawn" x="384" y="192" width="160" height="160">
   <properties>
    <property name="quantity" value="3"/>
   </properties>
  </object>
-  <object name="slargrum_1" type="spawn" x="416" y="352" width="96" height="128">
+  <object name="forestfly1" type="spawn" x="512" y="352" width="224" height="96">
   <properties>
    <property name="quantity" value="3"/>
   </properties>
  </object>
-  <object name="forestregral2" type="spawn" x="416" y="288" width="64" height="32">
-   <properties>
-    <property name="quantity" value="2"/>
-   </properties>
-  </object>
-  <object name="werewolf_1" type="spawn" x="384" y="192" width="160" height="64">
-   <properties>
-    <property name="quantity" value="2"/>
-   </properties>
-  </object>
-  <object name="slargrum_2" type="spawn" x="512" y="384" width="96" height="64"/>
-  <object name="werewolf_1" type="spawn" x="608" y="384" width="32" height="32"/>
-  <object name="urdom_1" type="spawn" x="640" y="352" width="96" height="96"/>
-  <object name="slargrum_2" type="spawn" x="736" y="416" width="32" height="32"/>
-  <object name="forestregral2" type="spawn" x="768" y="384" width="96" height="128"/>
-  <object name="zortak_2" type="spawn" x="32" y="768" width="96" height="32"/>
-  <object name="undeadcr3" type="spawn" x="512" y="736" width="128" height="224">
-   <properties>
-    <property name="quantity" value="2"/>
-   </properties>
-  </object>
-  <object name="zortak_2" type="spawn" x="544" y="704" width="64" height="32">
-   <properties>
-    <property name="quantity" value="2"/>
-   </properties>
-  </object>
-  <object name="slargrum_7" type="spawn" x="544" y="640" width="64" height="32">
-   <properties>
-    <property name="quantity" value="2"/>
-   </properties>
-  </object>
-  <object name="xalirg_1" type="spawn" x="768" y="864" width="160" height="96"/>
-  <object name="zortak_3" type="spawn" x="896" y="768" width="32" height="96"/>
-  <object name="xalirg_2" type="spawn" x="768" y="736" width="128" height="64"/>
-  <object name="zortak_4" type="spawn" x="576" y="512" width="352" height="128">
+  <object name="lodar_fg3" type="spawn" x="736" y="384" width="96" height="96"/>
+  <object name="yjacket1" type="spawn" x="64" y="544" width="96" height="192">
   <properties>
    <property name="quantity" value="3"/>
   </properties>
  </object>
-  <object name="xalirg_1" type="spawn" x="832" y="320" width="64" height="32">
+  <object name="yjacket2" type="spawn" x="128" y="256" width="160" height="160">
+   <properties>
+    <property name="quantity" value="2"/>
+   </properties>
+  </object>
+  <object name="yjacket1" type="spawn" x="160" y="416" width="192" height="192">
+   <properties>
+    <property name="quantity" value="2"/>
+   </properties>
+  </object>
+  <object name="morkins" type="spawn" x="768" y="288" width="32" height="32"/>
+  <object name="morkins" type="spawn" x="864" y="96" width="32" height="32"/>
+  <object name="morkin3" type="spawn" x="896" y="160" width="32" height="128"/>
+  <object name="morkin1" type="spawn" x="832" y="320" width="64" height="64"/>
+  <object name="morkins" type="spawn" x="768" y="736" width="96" height="64"/>
+  <object name="morkin3" type="spawn" x="768" y="896" width="64" height="32"/>
+  <object name="morkin2" type="spawn" x="544" y="704" width="64" height="32"/>
+  <object name="morkin1" type="spawn" x="576" y="544" width="320" height="128">
+   <properties>
+    <property name="quantity" value="2"/>
+   </properties>
+  </object>
+  <object name="morkin1" type="spawn" x="512" y="768" width="128" height="160">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
  </object>
-  <object name="undeadcr3" type="spawn" x="896" y="128" width="32" height="160"/>
 </objectgroup>
 <objectgroup name="Keys" width="30" height="30"/>
 </map>
--- a/AndorsTrail/res/xml/lodar12.tmx
+++ b/AndorsTrail/res/xml/lodar12.tmx
@@ -128,17 +128,17 @@
   eJzNlOENgkAMhfF+6BKuICsYR3AM12AFjxGAEdABjAlT6YVrLC+9XkFM/PFyIc19tL32eVcUnqlWvq8Qo/hj+5EU/zXvtBll4bVuqu7L/G5uqrvCawy8wU2l5dsLzC6TXy7fntVdx7iWHwrr88AjzjPxvhbxd+G5rcFD5ho8qnu/gJXiHd4q/4QnzfRcXhUlxTojT2NwVpjpY4bHe9TCyeuk/TjHHHO88P+wd5fdeDbA47On8RpWyxB54cT9RV4lyMd73AsCD3O35ocerfWW81LvkeNJPdTmBT0fxX0VeZIfo4emmFQ35+X82NJHvm8WP57Dm3Nfm/m1/IV2bgkPZ946L3hX8xjilZH3AmZmZNs=
  </data>
 </layer>
- <layer name="Objects" width="20" height="30" visible="0">
+ <layer name="Objects" width="20" height="30">
  <data encoding="base64" compression="zlib">
   eJyFVj1v1EAQXZvWFpuaClr+BBL5DylMzy8AKVFCCqqcoEgaRP4P0NIAUnwnjg8JKb67kFDeXcg8dt55PHbESKvxrXfevvn0XcUQ8q0QrlRfin4iK8hzJguC31VMz9j350/yELbLEP4U3XfQwID96K6Yln2870UXE+cfy7nfMWFveKieF8pPZFwkXYueyTrX3xBiQSZF1x+cA9+6aPksjK3lBy60/aV75IY7T7O0Bz3X59d6rin6eFPZW+r+btnGlH5DLgTnSNY6S7Hd+GD4jWLoCLjwPuD8UB/fCsbfLOm18sPzQvcs3+O8xbP37cn7fVkH6jfwoNeqR6KvFQt8sccYwW/kjPHFe+w9KpMfvl5ykyOIr6XK+A1/dzQWr2Lyw2PRbjFQZ5DKxRGcX+ZtHFl7nt/S8aPYPNMOmE9j8ml8i1//xNW6xbP34d070e9j9x6L9UxraWbyGFz8LL9Psj5H00OGA+L8daAesA4Vr3b8cO/c2Ey0P8EXdT+EQWkcFgS1/FH9nWk9ZWXL5zC299Gev1eu/ylTc+/UcGVvAR9YiCVn11nRxvRSz7FHLQalk18V9B1isciMnfIDFmrkoWLux/46cPF6o/OCPWiFfTjRfOC5cTxfGDzcj7PgiJrbzARXm9903rD2Vybf52oHLDuTUSOcoTyL/v0g616e3tl4NWZuHJVtD6xUjwfiDfli5k/m+pXyXPO5a/qkcXmlr/XA9wNy5jC3y9AT+HPsZiJ8vi9nH6C+NHenJnesp6EZSF3pt5H9C0FMl2auX+j3Y1q03G6bj5Xy429yvVYOzBu/C4xJZ+6YbzT59WabyE+TP/aS73k7HzgjNv8J1FfEp3b2W2XflvasuTvuu4sYWWwIagh1tufu/p+G7BjfbwDyCAnd
  </data>
 </layer>
- <layer name="Above" width="20" height="30" visible="0">
+ <layer name="Above" width="20" height="30">
  <data encoding="base64" compression="zlib">
   eJy9ld0RwiAQhCMVhGcLSwekjowVWJXtmA4cHE8v63Ic4LgvmQT47i93TNO3ltl+R62V9Vbe6Pp90N6o/fRjXuv+Vh76q5Vri+uSX8wz+3YN7b7tBh91CfU9XnnsZTH/9srZs/LTayfv01zvOYtzin2MAyd+OFtHXG+9OBupYSuLMUqy5hXm3NonrAT/gTBKMazz8amF/fHMc4QnsMT+Av9K9sHTb7qHdCxsLjAey1ftTmC2LXnikJg9tks8VjPP/ZdI7oUVoGa1mJHF1NPHvfPjX7L80/3N6ntjZwtzCqXrq/uX2fZIz/oHm3FEVg==
  </data>
 </layer>
- <layer name="Walkable" width="20" height="30" visible="0">
+ <layer name="Walkable" width="20" height="30">
  <data encoding="base64" compression="zlib">
   eJy1kssNwCAMQxmhS7H/SlwRavwJJlIPlRLnYWd+Y8zH315pvarUWcbXYWZ6rh+sP+1v990pPTXH5P5kHmhf986cuao6fPs/ejPiU3jULFQtd9dfPytFT7kP1Je6b1eL8Vd5nTOqHwqDkwNjQOVq3bClMnilhTy7ZUn4ldQ67zfh/wLz+Yx0
  </data>
@@ -181,46 +181,27 @@
   </properties>
  </object>
 </objectgroup>
- <objectgroup name="Spawn" width="20" height="30" visible="0">
-  <object name="zortak_3" type="spawn" x="32" y="832" width="224" height="96">
+ <objectgroup name="Spawn" width="20" height="30">
+  <object name="morkin_cr" type="spawn" x="96" y="96" width="32" height="32"/>
+  <object name="morkins" type="spawn" x="64" y="640" width="96" height="128"/>
+  <object name="morkin1" type="spawn" x="64" y="768" width="224" height="128"/>
+  <object name="morkin4" type="spawn" x="160" y="96" width="96" height="96"/>
+  <object name="morkin3" type="spawn" x="256" y="64" width="128" height="32">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
  </object>
-  <object name="xalirg_2" type="spawn" x="160" y="640" width="256" height="160">
-   <properties>
-    <property name="quantity" value="3"/>
-   </properties>
-  </object>
-  <object name="zortak_4" type="spawn" x="320" y="544" width="32" height="96"/>
-  <object name="xalirg_1" type="spawn" x="288" y="512" width="96" height="32">
-   <properties>
-    <property name="quantity" value="3"/>
-   </properties>
-  </object>
-  <object name="undeadcr3" type="spawn" x="384" y="448" width="96" height="128"/>
-  <object name="zortak_4" type="spawn" x="448" y="384" width="32" height="32"/>
-  <object name="slargrum_9" type="spawn" x="448" y="320" width="32" height="32"/>
-  <object name="xalirg_2" type="spawn" x="448" y="192" width="32" height="96"/>
-  <object name="undeadcr3" type="spawn" x="352" y="64" width="160" height="128">
+  <object name="morkin2" type="spawn" x="448" y="192" width="32" height="96"/>
+  <object name="morkin2" type="spawn" x="448" y="320" width="32" height="32"/>
+  <object name="morkin1" type="spawn" x="448" y="384" width="32" height="32"/>
+  <object name="morkin3" type="spawn" x="320" y="544" width="32" height="32"/>
+  <object name="morkin1" type="spawn" x="128" y="256" width="224" height="192"/>
+  <object name="morkin1" type="spawn" x="64" y="448" width="160" height="128"/>
+  <object name="morkin2" type="spawn" x="192" y="640" width="224" height="128">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
  </object>
-  <object name="slargrum_9" type="spawn" x="288" y="64" width="64" height="32"/>
-  <object name="zortak_4" type="spawn" x="160" y="64" width="128" height="128"/>
-  <object name="undeadcr3" type="spawn" x="32" y="640" width="128" height="128">
-   <properties>
-    <property name="quantity" value="2"/>
-   </properties>
-  </object>
-  <object name="xalirg_1" type="spawn" x="32" y="416" width="160" height="160">
-   <properties>
-    <property name="quantity" value="3"/>
-   </properties>
-  </object>
-  <object name="zortak_3" type="spawn" x="192" y="288" width="32" height="32"/>
-  <object name="undeadcr3" type="spawn" x="192" y="352" width="32" height="32"/>
 </objectgroup>
 <objectgroup name="Keys" width="20" height="30"/>
 </map>
--- a/AndorsTrail/res/xml/lodar12cave0.tmx
+++ b/AndorsTrail/res/xml/lodar12cave0.tmx
@@ -1,125 +1,124 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="15" height="15" tilewidth="32" tileheight="32">
 <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="576" height="192"/>
 </tileset>
 <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="576" height="192"/>
 </tileset>
 <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="576" height="192"/>
 </tileset>
 <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="480" height="256"/>
 </tileset>
 <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="480" height="256"/>
 </tileset>
 <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="512" height="256"/>
 </tileset>
 <layer name="Ground" width="15" height="15">
  <data encoding="base64" compression="zlib">
@@ -156,27 +155,23 @@
  </object>
 </objectgroup>
 <objectgroup name="Spawn" width="15" height="15">
-  <object name="slargrum_9" type="spawn" x="224" y="320" width="224" height="128">
+  <object name="cryptmist1" type="spawn" x="128" y="128" width="32" height="32"/>
+  <object name="cryptmist2" type="spawn" x="256" y="160" width="32" height="32"/>
+  <object name="cryptmist1" type="spawn" x="64" y="192" width="32" height="64"/>
+  <object name="cryptmist1" type="spawn" x="96" y="352" width="64" height="32"/>
+  <object name="cryptmist2" type="spawn" x="32" y="256" width="64" height="32">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
  </object>
-  <object name="slargrum_7" type="spawn" x="32" y="320" width="64" height="32">
+  <object name="cryptmist1" type="spawn" x="160" y="320" width="288" height="128"/>
+ </objectgroup>
+ <objectgroup name="Spawn_bats" width="15" height="15" visible="0">
+  <object name="cavebat1" type="spawn" x="32" y="96" width="416" height="352">
   <properties>
-    <property name="quantity" value="2"/>
+    <property name="quantity" value="5"/>
   </properties>
  </object>
-  <object name="undeadcr2" type="spawn" x="32" y="256" width="64" height="32">
-   <properties>
-    <property name="quantity" value="2"/>
-   </properties>
-  </object>
-  <object name="undeadcr3" type="spawn" x="64" y="96" width="256" height="128">
-   <properties>
-    <property name="quantity" value="2"/>
-   </properties>
-  </object>
-  <object name="undeadcr3" type="spawn" x="128" y="352" width="32" height="32"/>
 </objectgroup>
 <objectgroup name="Keys" width="15" height="15"/>
 </map>
--- a/AndorsTrail/res/xml/lodar12cave1.tmx
+++ b/AndorsTrail/res/xml/lodar12cave1.tmx
@@ -1,125 +1,124 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="20" height="25" tilewidth="32" tileheight="32">
 <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="576" height="192"/>
 </tileset>
 <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="576" height="192"/>
 </tileset>
 <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="576" height="192"/>
 </tileset>
 <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="480" height="256"/>
 </tileset>
 <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="480" height="256"/>
 </tileset>
 <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="512" height="256"/>
 </tileset>
 <layer name="Ground" width="20" height="25">
  <data encoding="base64" compression="zlib">
@@ -136,7 +135,7 @@
   eJxjYKA9SBegrhlpFJoHMotSM5BBOJpZbjzUNY9SIM5EXfOGGkBOOyD2VF7KzEijMC2Sm/5w5SNc6YVQOsSlj9z0Qu10OxTyATllGz49pPqZUFoixc+UlIvY/ESJWbQsnykFg7k8BQDZgA+k
  </data>
 </layer>
- <layer name="Walkable" width="20" height="25" visible="0">
+ <layer name="Walkable" width="20" height="25">
  <data encoding="base64" compression="zlib">
   eJzlksENACAIAx3Bpdx/JV8mxiCUUl+S8D2vldFbG5/vmipjZ1WYFkPhdxsrh4Jv9aL0VvCqf3bmZO4Kzeaxblk8h+gtr6ssL/KMukE7RHpCeJneX/AyTMaB9WNYbCb0JhkPhmH5KbtS7ARe1H+B
  </data>
@@ -156,30 +155,23 @@
  </object>
 </objectgroup>
 <objectgroup name="Spawn" width="20" height="25">
-  <object name="slargrum_9" type="spawn" x="32" y="96" width="224" height="160"/>
-  <object name="slargrum_7" type="spawn" x="128" y="704" width="32" height="64">
+  <object name="cryptmist3" type="spawn" x="32" y="96" width="256" height="128"/>
+  <object name="cryptmist2" type="spawn" x="288" y="512" width="32" height="64"/>
+  <object name="cryptmist2" type="spawn" x="160" y="704" width="64" height="32"/>
+  <object name="cryptmist2" type="spawn" x="480" y="352" width="32" height="32"/>
+  <object name="cryptmist3" type="spawn" x="480" y="384" width="128" height="192"/>
+  <object name="cryptmist1" type="spawn" x="256" y="256" width="288" height="96">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
  </object>
-  <object name="undeadcr3" type="spawn" x="192" y="640" width="192" height="96"/>
-  <object name="undeadcr2" type="spawn" x="288" y="576" width="64" height="32">
+  <object name="cryptmist3" type="spawn" x="64" y="384" width="96" height="96"/>
+  <object name="cryptmist1" type="spawn" x="192" y="352" width="160" height="160"/>
+ </objectgroup>
+ <objectgroup name="Spawn_bats" width="20" height="25" visible="0">
+  <object name="cavebat1" type="spawn" x="32" y="96" width="576" height="672">
   <properties>
-    <property name="quantity" value="2"/>
-   </properties>
-  </object>
-  <object name="xalirg_1" type="spawn" x="64" y="352" width="256" height="160"/>
-  <object name="slargrum_8" type="spawn" x="32" y="352" width="288" height="160"/>
-  <object name="undeadcr3" type="spawn" x="224" y="192" width="160" height="192">
-   <properties>
-    <property name="quantity" value="2"/>
-   </properties>
-  </object>
-  <object name="xalirg_1" type="spawn" x="416" y="256" width="32" height="64"/>
-  <object name="undeadcr3" type="spawn" x="480" y="352" width="32" height="32"/>
-  <object name="slargrum_9" type="spawn" x="480" y="384" width="128" height="192">
-   <properties>
-    <property name="quantity" value="2"/>
+    <property name="quantity" value="5"/>
   </properties>
  </object>
 </objectgroup>
--- a/AndorsTrail/res/xml/lodar13.tmx
+++ b/AndorsTrail/res/xml/lodar13.tmx
@@ -1,128 +1,127 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="30" height="12" tilewidth="32" tileheight="32">
 <properties>
  <property name="outside" value="1"/>
 </properties>
 <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="576" height="192"/>
 </tileset>
 <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="576" height="192"/>
 </tileset>
 <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="576" height="192"/>
 </tileset>
 <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="480" height="256"/>
 </tileset>
 <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="480" height="256"/>
 </tileset>
 <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="512" height="256"/>
 </tileset>
 <layer name="Ground" width="30" height="12">
  <data encoding="base64" compression="zlib">
@@ -157,40 +156,27 @@
    <property name="place" value="west"/>
   </properties>
  </object>
+  <object name="rest1" type="rest" x="448" y="192" width="32" height="64"/>
 </objectgroup>
- <objectgroup name="Spawn" width="30" height="12" visible="0">
-  <object name="zagroph" type="spawn" x="512" y="128" width="32" height="32"/>
-  <object name="undeadcr1" type="spawn" x="160" y="32" width="128" height="160">
+ <objectgroup name="Spawn" width="30" height="12">
+  <object name="aulowenn" type="spawn" x="480" y="128" width="32" height="32"/>
+  <object name="erumen_f1" type="spawn" x="160" y="64" width="128" height="128"/>
+  <object name="erumen_f1" type="spawn" x="128" y="192" width="256" height="160">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
  </object>
-  <object name="slargrum_5" type="spawn" x="128" y="192" width="256" height="160">
-   <properties>
-    <property name="quantity" value="2"/>
-   </properties>
-  </object>
-  <object name="undeadcr1" type="spawn" x="96" y="192" width="320" height="160">
-   <properties>
-    <property name="quantity" value="3"/>
-   </properties>
-  </object>
-  <object name="slargrum_4" type="spawn" x="448" y="256" width="96" height="96"/>
-  <object name="undeadcr1" type="spawn" x="544" y="192" width="128" height="96">
-   <properties>
-    <property name="quantity" value="2"/>
-   </properties>
-  </object>
-  <object name="slargrum_5" type="spawn" x="672" y="128" width="192" height="96">
-   <properties>
-    <property name="quantity" value="2"/>
-   </properties>
-  </object>
-  <object name="undeadcr1" type="spawn" x="672" y="96" width="256" height="224">
+  <object name="erumen_f1" type="spawn" x="544" y="128" width="352" height="192">
   <properties>
    <property name="quantity" value="3"/>
   </properties>
  </object>
 </objectgroup>
- <objectgroup name="Keys" width="30" height="12" visible="0"/>
+ <objectgroup name="Keys" width="30" height="12">
+  <object name="lodar13_rest:60" type="key" x="448" y="192" width="32" height="64">
+   <properties>
+    <property name="phrase" value="lodar13_rest"/>
+   </properties>
+  </object>
+ </objectgroup>
 </map>
--- a/AndorsTrail/res/xml/lodar14.tmx
+++ b/AndorsTrail/res/xml/lodar14.tmx
@@ -138,7 +138,7 @@
   eJy9lc0NgCAMhcGzJDodG+gcLuHREVzDEdyC6AaixIQ0RVp+fCe09Osr1SBEeR2dEGeXx4D5ubxaKtErFMbb7LtFleHt9nm1rFmlMX2eaR3DSMfM1eNLuvXo1bnXsbMOxe7cwYsdxHlhvBDnj28A04bso/aXopiv8SPO8UWZN9WXBjHoA/MV4mlk/rLn++P29yVKP1xOjq9QfQqfUpfbH/xH3nPncE5kXrH8qYnv5fooIb//GnOm6s87/QJ2OUb3
  </data>
 </layer>
- <layer name="Walkable" width="19" height="30" visible="0">
+ <layer name="Walkable" width="19" height="30">
  <data encoding="base64" compression="zlib">
   eJy1k1EOgDAIQz3CLrX7X8nfuZTxCpNkMcpsS4E5HhlzfE/0XZ0ML+PKMJ0cwexgUd8cbRFmxTcHT0WnF1Qv4brhtcq596McrdP1kfRThcu9PomuvfZb+3Gq+5RXPCccZ44zL6u6CT+dpT94Kr44POr+HpW9cHaFzsX6nv3fnQvVA4czq6mLRXS7mjo4BO8FMdl2ig==
  </data>
@@ -182,90 +182,62 @@
  </object>
  <object name="sign_lodar14" type="sign" x="480" y="224" width="96" height="64"/>
 </objectgroup>
- <objectgroup name="Spawn" width="19" height="30" visible="0">
-  <object name="werewolf_2" type="spawn" x="64" y="32" width="192" height="96">
-   <properties>
-    <property name="quantity" value="2"/>
-   </properties>
-  </object>
-  <object name="slargrum_4" type="spawn" x="128" y="128" width="224" height="224">
-   <properties>
-    <property name="quantity" value="4"/>
-   </properties>
-  </object>
-  <object name="forestregral3" type="spawn" x="320" y="352" width="32" height="32"/>
-  <object name="slargrum_4" type="spawn" x="224" y="384" width="160" height="160">
+ <objectgroup name="Spawn" width="19" height="30">
+  <object name="yjacket2" type="spawn" x="448" y="352" width="128" height="192">
   <properties>
    <property name="quantity" value="3"/>
   </properties>
  </object>
-  <object name="werewolf_2" type="spawn" x="384" y="384" width="32" height="32"/>
-  <object name="slargrum_4" type="spawn" x="416" y="352" width="160" height="192">
-   <properties>
-    <property name="quantity" value="4"/>
-   </properties>
-  </object>
-  <object name="undeadcr1" type="spawn" x="512" y="544" width="32" height="32"/>
-  <object name="slargrum_5" type="spawn" x="512" y="576" width="64" height="288">
+  <object name="yjacket1" type="spawn" x="480" y="544" width="64" height="32"/>
+  <object name="yjacket1" type="spawn" x="512" y="576" width="32" height="128"/>
+  <object name="erumen_f1" type="spawn" x="64" y="288" width="64" height="128"/>
+  <object name="erumen_f1" type="spawn" x="96" y="416" width="32" height="32"/>
+  <object name="forestfly1" type="spawn" x="64" y="448" width="128" height="160">
   <properties>
    <property name="quantity" value="3"/>
   </properties>
  </object>
-  <object name="undeadcr1" type="spawn" x="352" y="832" width="160" height="96">
+  <object name="erumen_f1" type="spawn" x="160" y="608" width="32" height="32"/>
+  <object name="erumen_f1" type="spawn" x="64" y="640" width="192" height="192">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
  </object>
-  <object name="slargrum_5" type="spawn" x="512" y="192" width="64" height="160"/>
-  <object name="undeadcr1" type="spawn" x="448" y="128" width="32" height="64">
+  <object name="forestfly1" type="spawn" x="32" y="640" width="384" height="192">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
  </object>
-  <object name="slargrum_5" type="spawn" x="352" y="96" width="96" height="128"/>
-  <object name="slargrum_4" type="spawn" x="320" y="32" width="128" height="64">
+  <object name="tiqui" type="spawn" x="320" y="544" width="32" height="32"/>
+  <object name="yjacket2" type="spawn" x="128" y="64" width="96" height="32">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
  </object>
-  <object name="undeadcr1" type="spawn" x="32" y="224" width="96" height="192">
-   <properties>
-    <property name="quantity" value="2"/>
-   </properties>
-  </object>
-  <object name="slargrum_5" type="spawn" x="96" y="416" width="32" height="32"/>
-  <object name="slargrum_4" type="spawn" x="64" y="448" width="128" height="160">
+  <object name="hanklbit1" type="spawn" x="192" y="96" width="64" height="32"/>
+  <object name="yjacket3" type="spawn" x="192" y="160" width="160" height="192">
   <properties>
    <property name="quantity" value="3"/>
   </properties>
  </object>
-  <object name="slargrum_6" type="spawn" x="160" y="608" width="32" height="32"/>
-  <object name="undeadcr2" type="spawn" x="64" y="640" width="192" height="192">
+  <object name="yjacket3" type="spawn" x="320" y="352" width="32" height="32"/>
+  <object name="yjacket3" type="spawn" x="384" y="384" width="32" height="32"/>
+  <object name="yjacket2" type="spawn" x="224" y="416" width="96" height="128">
   <properties>
    <property name="quantity" value="3"/>
   </properties>
  </object>
-  <object name="forestregral3" type="spawn" x="32" y="640" width="224" height="192">
+  <object name="yjacket4" type="spawn" x="352" y="736" width="192" height="160">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
  </object>
-  <object name="forestregral4" type="spawn" x="288" y="544" width="96" height="64">
+  <object name="yjacket2" type="spawn" x="384" y="96" width="160" height="160">
   <properties>
-    <property name="respawn" value="false"/>
+    <property name="quantity" value="3"/>
   </properties>
  </object>
-  <object name="undeadcr1" type="spawn" x="352" y="608" width="64" height="32">
-   <properties>
-    <property name="quantity" value="2"/>
-   </properties>
-  </object>
-  <object name="undeadcr2" type="spawn" x="352" y="672" width="64" height="32">
-   <properties>
-    <property name="quantity" value="2"/>
-   </properties>
-  </object>
-  <object name="slargrum_5" type="spawn" x="256" y="704" width="128" height="64"/>
+  <object name="zortaks" type="spawn" x="352" y="64" width="64" height="32"/>
 </objectgroup>
 <objectgroup name="Keys" width="19" height="30" visible="0"/>
 </map>
--- a/AndorsTrail/res/xml/lodar15.tmx
+++ b/AndorsTrail/res/xml/lodar15.tmx
@@ -128,17 +128,17 @@
   eJw7ysbAcBSIJzMxMEyhEB8d5GYtpaJZ25koNw9mFjXMQzYLZh65YYduFiXxMNzMWoYFYzOLUFwuB+IdWDA2s2BpA5vdIHN2AvEpLBibWTDzsNm9E48efJgUu0cx6RgA3OL4BA==
  </data>
 </layer>
- <layer name="Objects" width="19" height="19" visible="0">
+ <layer name="Objects" width="19" height="19">
  <data encoding="base64" compression="zlib">
   eJyNU81OwzAMTsrVlVbtkeBleACQeAS4sQtiL8QdCZBgSBOXSqObKNzYqPBHktm10g5LkZP4y2fHP+3EuTU598G65ZUknaE/eRVVwFVlsHe8r4Gvgg0Yz/ou3mG/54xni4WsKOiTyJt84d3TJPpwwnHOuFfqY7V4tjfU9wm9pD7uXZ338aj4NO80xvZFIa57lafEuyB5b/OW+Dvq8+HujW3XhfAhD4htqfgsD+qAvAH3wHePqlZt5NO1hNSmDtApDvi6MPnX+i++SnJyHGN8phDLhqSWZyM8udzoHDYmP0M8+g9DNRt7b/H4T52p2SG/uZ7e8h9Oy3ztbO9DNt65Wx/2cy/275iLl9SnGb/e/LeLPDesL73MLCTp1GtzL+/Waj8rpB+2mRlBjXck85r44POK148XnqNS/K5GZhbzvDDzqSW9RW/tDE+unkN2xN+ofh3DDc2engMt/+33Q/c5/QuKMpwU
  </data>
 </layer>
- <layer name="Above" width="19" height="19" visible="0">
+ <layer name="Above" width="19" height="19">
  <data encoding="base64" compression="zlib">
   eJxjYCAefBQgQTEZ4AMJ5iOrBbkLxCfHffjspJV/jwLNPUZFs9H9AOOTGia4woJREMEmxjxS4hGbeTB3k2IOsnmk6Kd1msYH0qlkN8icNBxmkeo/bOaQEw/YAKE8ixxv+PI0oTxLrHsp8Rep6YwSAAD8yy+s
  </data>
 </layer>
- <layer name="Walkable" width="19" height="19" visible="0">
+ <layer name="Walkable" width="19" height="19">
  <data encoding="base64" compression="zlib">
   eJxzFWBgcCUBIwNS9BEyC5+ZyOLY1BJrDrlqqRUe1DSPWnYSGxb41JMSpsTEBznmUOofStMytrRKqTnUchtyPJEbJ+SGLy6/UArold5pbQ4xGACfx1RX
  </data>
@@ -157,53 +157,44 @@
   </properties>
  </object>
 </objectgroup>
- <objectgroup name="Spawn" width="19" height="19" visible="0">
-  <object name="undeadcr1" type="spawn" x="352" y="32" width="192" height="96">
-   <properties>
-    <property name="quantity" value="2"/>
-   </properties>
-  </object>
-  <object name="slargrum_5" type="spawn" x="480" y="128" width="64" height="32">
-   <properties>
-    <property name="quantity" value="2"/>
-   </properties>
-  </object>
-  <object name="zortak_1" type="spawn" x="384" y="160" width="192" height="160">
-   <properties>
-    <property name="quantity" value="2"/>
-   </properties>
-  </object>
-  <object name="undeadcr1" type="spawn" x="352" y="256" width="32" height="64">
-   <properties>
-    <property name="quantity" value="2"/>
-   </properties>
-  </object>
-  <object name="slargrum_5" type="spawn" x="96" y="64" width="256" height="256">
-   <properties>
-    <property name="quantity" value="2"/>
-   </properties>
-  </object>
-  <object name="undeadcr1" type="spawn" x="64" y="64" width="288" height="256">
+ <objectgroup name="Spawn" width="19" height="19">
+  <object name="yjacket4" type="spawn" x="384" y="192" width="192" height="128">
   <properties>
    <property name="quantity" value="3"/>
   </properties>
  </object>
-  <object name="forestuylom2" type="spawn" x="192" y="480" width="160" height="32">
-   <properties>
-    <property name="quantity" value="2"/>
-   </properties>
-  </object>
-  <object name="undeadcr2" type="spawn" x="352" y="416" width="224" height="160">
+  <object name="yjacket5" type="spawn" x="96" y="64" width="128" height="96">
   <properties>
    <property name="quantity" value="3"/>
   </properties>
  </object>
-  <object name="zortak_2" type="spawn" x="64" y="320" width="128" height="128"/>
-  <object name="forestuylom2" type="spawn" x="32" y="320" width="160" height="224">
+  <object name="yjacket3" type="spawn" x="160" y="160" width="256" height="160">
+   <properties>
+    <property name="quantity" value="3"/>
+   </properties>
+  </object>
+  <object name="yjacket2" type="spawn" x="352" y="64" width="192" height="128">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
  </object>
+  <object name="brtender_cr" type="spawn" x="64" y="320" width="96" height="96"/>
+  <object name="hanklbit4" type="spawn" x="160" y="448" width="32" height="96">
+   <properties>
+    <property name="quantity" value="3"/>
+   </properties>
+  </object>
+  <object name="hanklbit3" type="spawn" x="192" y="480" width="192" height="32">
+   <properties>
+    <property name="quantity" value="2"/>
+   </properties>
+  </object>
+  <object name="hanklbit2" type="spawn" x="384" y="416" width="160" height="160">
+   <properties>
+    <property name="quantity" value="2"/>
+   </properties>
+  </object>
+  <object name="brtender1" type="spawn" x="64" y="416" width="96" height="96"/>
 </objectgroup>
 <objectgroup name="Keys" width="19" height="19" visible="0"/>
 </map>
--- a/AndorsTrail/res/xml/lodar16.tmx
+++ b/AndorsTrail/res/xml/lodar16.tmx
@@ -128,17 +128,17 @@
   eJzNlt0NwjAMhIEH2IttWIMVaEdoGYF2AITUqcBST5ws23HTIvFwgoKTz45/0uaw2zUJ3ZJ27aw1e9QyX8f/YvakaK+O7CO7e4I5kLpgr8dHl9PXrjckvDHIJ9ZNpEeBK0zYDYZGOl/P78H53eMKE98nQxyv5zfbsUrxcu6ieD1Za7qZG9UqcmfFW/LVWgOex7wmYqlRibk1r5bZ02e27zVT9yHn0qsn9HC27zVT96HsJ9K55HpCDy/pewg2vBZMtmtnHvzQ/0PgRmdt+RYxM2fnzaESV8ubc54y/ZuZDUuYS2qYn/U98kumMM77/Fy1lO3XjmISZnauWnko1RDnFDEJMxuPdZ/X+JphWnccevhpvLOsZaJf9SwSFrSWqec9mMzQ0usteUyuZ2ZGPGZm3191nHr23TdmWrG3ilc615o4rZpZwtuKmakb1hteoxte
  </data>
 </layer>
- <layer name="Objects" width="29" height="30" visible="0">
+ <layer name="Objects" width="29" height="30">
  <data encoding="base64" compression="zlib">
   eJx9VztvE0EQ3nPaPems/AJo+CHkP7hw6tDRUYBCqB0pBW5QLH4PqSnAkh+yLSIh+XGA6RJfYD/fjO+78dojrdbZm53HN4+drDPnGk3n1rQnYZ9550ZhvU2da4ez31mdB/sfOecd987DfhXW+7CUvpIMyHfNuqyVL/mKsM99qdPy8F2WAb3Q+UN04wx07+s8MR+UpqrT1eVjn4Rv47BysVHtOM+qxfKsnzF/4WNBOgfh96N3UdrJcqWuCflp9eSJudzc9/c62+extiaEzU3gf52VO+Op9BR0fgrrc1KXyfbBv48N5xbk463w98L+i+52A99pWvq48WVsrE3DcLYUDCHX6gW9SUuclcAHGzui619S6TtLK3wHcgfxXol8xFR51IdDekFLyZmfBmvotDG6EZ6p2krYKS7AqpfU9XKeDT3dF3oVvrWyUidipDUKf+HXA/HPCWPwXyf7tb3VS34Cj43IeJlWWMZqlnObc3Epdj/4+re16INfXLcclzvxJVZvkDuMyOQYTag/cE+bmXPNO2DUt33MlfmSpAT8gZpXKiLy72zvUT4r05V9WQk5xnW0zS2jdxTBHn72s+oeCLk2JN6Z/D5j31xZV5wbT5rPpBe0OICj5i9yTGsQ8erKeU42tERWJ+LXrv4EG81FvFmxPoWceSE5q32B+8M95RqTzR/V2yPbC5Nrtd7gqtocmzdEMdKcLejvQ/4u6C2y+CrPSPrjDk/TP9FftY8hd7WW80jMZoTRI+lVeX+lR2oPUCxWdE8pj5wtjMwvQe9JWmGrPfRU+rnqWZH9oNukvncbx3uA5sG3cPbdxLygfqo4biK2g1C7yM8uvW9WH+sd+Do2sN/iot8Xvt4HVEf/SI7G3nKWcSF3Yz2X+xRiqm8F7JsQVrFZUIn7keoD35ziHMPmWcDheVrFu0Pv5Ltwdikzpe0nF+adgs08VwIvvR9bkLmQeMP2XPg/ZGVsdZbVPn1sjtVd70/9/juKWlOZJzSjtLPqjQHpXNA3c5edYxPZcX/l43PuRHLuSnwGtpdiI8j2SVArIof7Fv7m/w1i8y5oLHXWTKsYKz9iZXMzlsfcX9sGD+ATmxNAuclx8PNMZueHjeTL2Nyz/wMdikNshtvO5b7StzT9WL8Nqff+B6ZlglQ=
  </data>
 </layer>
- <layer name="Above" width="29" height="30" visible="0">
+ <layer name="Above" width="29" height="30">
  <data encoding="base64" compression="zlib">
   eJytV4ENgzAMAy6A6/ig3DFx27Z34IMNQSbjpUlasIQqjTROUid0TXM/xn5/lu+z9rE9UTuPsxnK/JXyLmCPeZb6y9lJzXBFcJ6lYN7JiXd7n4TzJni+Uh+zs8B5pqAv5izRsMaLyNU6GlspWEuWDSKSr2YzBXSZ65V2+Nd6q/hiXk8j7BN91M6cWl1ufFpOtZyiJ6+HJU+tFjlI3+d+GzPnKKjJk3OcSLscT41uGYk4JAaJ39IP2rGtFYs20yO4qtsaTkGtbgWoHWsuPS/mhr2AfIw7ajiRZgRWn3nfX29mY/9ttXopdwQvZrQvqc1o1BP9M6Lxaby/2g6HBkmHnA/znXyCj9Oa4Xx0+zp3Z95I72y8sl/DTO+s+R7ltHpU6oC86YhR6sUzP3JufGbvwEzmO7TAuz/IvsgsWo08xky+Vpx3/D/x+BAf3dJ6WQ==
  </data>
 </layer>
- <layer name="Walkable" width="29" height="30" visible="0">
+ <layer name="Walkable" width="29" height="30">
  <data encoding="base64" compression="zlib">
   eJzNk1EOwCAIQz3CLuX9r7QvE2MsFCjLSMyWaXkF2XzGmGDtgc4o1xl/Yqp9nfms6Kh3vWd0WW6WedN4/cn20dIw+dRM9RyruFHt7WyGXeFVZtnLxdSy9ir+bz3s6JulizCj3qw+K+q0omPWIjPC8tizGV9s79C9MP1kufv3/Yk8eDkYn0xYc4l41j5ieEy0j7jRe7L0mcV6VTKjXCXz6zq7/Kn0FWZmdiL/R1Wn9vkCrfDULA==
  </data>
@@ -187,84 +187,59 @@
   </properties>
  </object>
 </objectgroup>
- <objectgroup name="Spawn" width="29" height="30" visible="0">
-  <object name="slargrum_5" type="spawn" x="192" y="32" width="128" height="128">
-   <properties>
-    <property name="quantity" value="3"/>
-   </properties>
-  </object>
-  <object name="zortak_2" type="spawn" x="288" y="160" width="32" height="32"/>
-  <object name="undeadcr2" type="spawn" x="352" y="128" width="32" height="96"/>
-  <object name="slargrum_6" type="spawn" x="288" y="224" width="160" height="192"/>
-  <object name="undeadcr2" type="spawn" x="256" y="224" width="192" height="192">
+ <objectgroup name="Spawn" width="29" height="30">
+  <object name="yjacket2" type="spawn" x="64" y="192" width="64" height="64"/>
+  <object name="yjacket2" type="spawn" x="32" y="384" width="96" height="192">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
  </object>
-  <object name="zortak_2" type="spawn" x="352" y="64" width="256" height="64">
-   <properties>
-    <property name="quantity" value="2"/>
-   </properties>
-  </object>
-  <object name="slargrum_6" type="spawn" x="352" y="416" width="64" height="96"/>
-  <object name="undeadcr2" type="spawn" x="288" y="512" width="160" height="96">
-   <properties>
-    <property name="quantity" value="2"/>
-   </properties>
-  </object>
-  <object name="zortak_3" type="spawn" x="416" y="416" width="96" height="96"/>
-  <object name="undeadcr2" type="spawn" x="544" y="352" width="32" height="64">
-   <properties>
-    <property name="quantity" value="2"/>
-   </properties>
-  </object>
-  <object name="zortak_3" type="spawn" x="576" y="288" width="160" height="96"/>
-  <object name="slargrum_5" type="spawn" x="640" y="384" width="32" height="96"/>
-  <object name="undeadcr2" type="spawn" x="704" y="128" width="192" height="224">
-   <properties>
-    <property name="quantity" value="3"/>
-   </properties>
-  </object>
-  <object name="zortak_1" type="spawn" x="608" y="512" width="64" height="32">
-   <properties>
-    <property name="quantity" value="2"/>
-   </properties>
-  </object>
-  <object name="slargrum_7" type="spawn" x="448" y="544" width="192" height="192">
-   <properties>
-    <property name="quantity" value="3"/>
-   </properties>
-  </object>
-  <object name="zortak_3" type="spawn" x="640" y="544" width="192" height="160">
-   <properties>
-    <property name="quantity" value="2"/>
-   </properties>
-  </object>
-  <object name="undeadcr3" type="spawn" x="384" y="640" width="32" height="32"/>
-  <object name="slargrum_6" type="spawn" x="384" y="704" width="32" height="32"/>
-  <object name="zortak_2" type="spawn" x="384" y="768" width="32" height="32"/>
-  <object name="undeadcr2" type="spawn" x="384" y="864" width="32" height="32"/>
-  <object name="slargrum_4" type="spawn" x="32" y="320" width="96" height="256">
+  <object name="yjacket4" type="spawn" x="64" y="576" width="224" height="224">
   <properties>
    <property name="quantity" value="4"/>
   </properties>
  </object>
-  <object name="undeadcr1" type="spawn" x="160" y="576" width="128" height="160">
+  <object name="vscale1" type="spawn" x="192" y="64" width="128" height="96">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
  </object>
-  <object name="undeadcr1" type="spawn" x="32" y="576" width="96" height="256">
+  <object name="vscale1" type="spawn" x="288" y="160" width="32" height="32"/>
+  <object name="vscaleb1" type="spawn" x="512" y="64" width="96" height="64"/>
+  <object name="vscale1" type="spawn" x="352" y="128" width="32" height="64"/>
+  <object name="vscale1" type="spawn" x="256" y="224" width="192" height="192">
+   <properties>
+    <property name="quantity" value="3"/>
+   </properties>
+  </object>
+  <object name="vscale1" type="spawn" x="352" y="416" width="64" height="64">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
  </object>
-  <object name="slargrum_4" type="spawn" x="128" y="640" width="32" height="64">
+  <object name="vscaleb1" type="spawn" x="384" y="640" width="32" height="224">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
  </object>
-  <object name="slargrum_5" type="spawn" x="64" y="192" width="64" height="64"/>
+  <object name="vscale1" type="spawn" x="288" y="480" width="192" height="160">
+   <properties>
+    <property name="quantity" value="2"/>
+   </properties>
+  </object>
+  <object name="vscale2" type="spawn" x="480" y="416" width="64" height="64"/>
+  <object name="vscaleb1" type="spawn" x="480" y="544" width="352" height="160">
+   <properties>
+    <property name="quantity" value="2"/>
+   </properties>
+  </object>
+  <object name="vscale2" type="spawn" x="640" y="384" width="32" height="96"/>
+  <object name="vscale1" type="spawn" x="704" y="128" width="160" height="192">
+   <properties>
+    <property name="quantity" value="3"/>
+   </properties>
+  </object>
+  <object name="vscale1" type="spawn" x="576" y="352" width="32" height="32"/>
 </objectgroup>
 <objectgroup name="Keys" width="29" height="30" visible="0"/>
 </map>
--- a/AndorsTrail/res/xml/lodar17.tmx
+++ b/AndorsTrail/res/xml/lodar17.tmx
@@ -128,17 +128,17 @@
   eJztk0EKgCAQRaVF94fsCOYR1AO08VQZKHwGM8eUFrV4uBDm+b8qJyFkYIkrlzXiAvtch+zkrPW97Wyl1dma8UtOHdeRzg3Q8Y+kvByngjl3mSzgYI/rNDBHFXynwwN0v9aZ8qU5huSmHZbOU+vErlJGzE073C7Ow3lD2JUBb65Dep+2wZcj1y3m8YSnPvSOyMPpvGeen7EcUriKrw==
  </data>
 </layer>
- <layer name="Objects" width="29" height="19" visible="0">
+ <layer name="Objects" width="29" height="19">
  <data encoding="base64" compression="zlib">
   eJyNVUtuFEEMrRq21VKPOAQHIXdgkQtwgSxgw5rsYBPBfSB7JDISySjDR4o0mZ5MskwyCX5qv9Tr6hqEJctd3baf7bLdcRrCfhtCMDkxvmnHMprsUghrY9DM9fEedGznjfG18XnqdSFvjU+NXzYhLNz2xvX23Yb+S3zag1Yuz0xeGl+0OQboXks8S4mTeBP/pnk+0XSYJwix3nvsz5usirwYM2x+2/lnyjbzNPT31vhdm+OA/zuPn/FeSqwXrrv0d3OPoawNa9KlrM9vhybfNOM8Wf+uqKn6JN0WeWrsZV15n5t2WE8Q7wE13Aqe3vd3O58Yvy7yhA7sznbY8RlSYwXtyZ3xPWPUewa9qvTEUmJROzyXPVDWT+McSKdNO44FPg+acV0najutz4nmp9TFXn6cjG1noluLl76uzMenOLzXsidI3+y8jT0e8mGvaJ570pfAQE/OvBb4/sFsH83HUcx+a3UEBubul9l9Mf7Knhcb3snTfFXu88pxHl0CH7RW/JBzAmEvsGf1u+bJnVerG7Dex4xJ3IfY79Ejr+GB5AP9Lg7xuBfYP6j3wvfutpgl0KnXmjlOzf8ff9fJXJOO/T4Zz8p3Ioh7GXMSm37Ol9xHjqs74EfKuCD0FGr8WXq0S7kv1ynvK9Dcn595TbiTcbcvZG5Y44X/O+aOe+g4D4K3Ev93HiP91PYhevdebKhXmwX67FLe5aWdnmtzrYS8de5oc57q+oqzS4724Y69onnyP/svvf+Vir9L7y8JDv1H
  </data>
 </layer>
- <layer name="Above" width="29" height="19" visible="0">
+ <layer name="Above" width="29" height="19">
  <data encoding="base64" compression="zlib">
   eJzVlU0KwyAQhSXrFuzpeoNklzuUnq3NaQrmBlWCdJg+50e76QMh0Zn3OSOJIWRdwpCu8RhVKT/v8TsukbnXSfZE+RITKQnrmr+FqXms5xBuk7wPKtQ3VCeP6a0zsVoeeTyj3tsWb1d6g/JqnMS09o9ztbzCu08416uSq/GWvD7Hz3PR5tivRQvzmMl77W+tk/O2Dj6tCUn7Rn/No+sj50ll5Xlk7TU/T20/SJ4+9NYzwm3xWvcIiuvhcn/+P7TcY5Ifn0f+LVG+xPPE/5veb4ZQsA==
  </data>
 </layer>
- <layer name="Walkable" width="29" height="19" visible="0">
+ <layer name="Walkable" width="29" height="19">
  <data encoding="base64" compression="zlib">
   eJxzFWBgcCUSwwCp6knVh0s/MeYQqxaXPDb9pNhJjJ/w6SXV7cSqJWQHMe4n1Z+kuHMwpDly9VHiP2rpH+z2weykt30D5U9a24tuNnpeo3ZcEwOoEQ6EzEemcZlPjL2E/ECqX3G5iZD51EpDxLhvqGEAHj6IeA==
  </data>
@@ -163,71 +163,42 @@
   </properties>
  </object>
 </objectgroup>
- <objectgroup name="Spawn" width="29" height="19" visible="0">
-  <object name="undeadcr2" type="spawn" x="352" y="32" width="192" height="64">
-   <properties>
-    <property name="quantity" value="2"/>
-   </properties>
-  </object>
-  <object name="zortak_2" type="spawn" x="448" y="96" width="96" height="64"/>
-  <object name="slargrum_7" type="spawn" x="320" y="96" width="96" height="128"/>
-  <object name="undeadcr1" type="spawn" x="288" y="192" width="32" height="64">
-   <properties>
-    <property name="quantity" value="2"/>
-   </properties>
-  </object>
-  <object name="slargrum_5" type="spawn" x="160" y="64" width="128" height="192">
-   <properties>
-    <property name="quantity" value="2"/>
-   </properties>
-  </object>
-  <object name="undeadcr2" type="spawn" x="736" y="32" width="160" height="128">
-   <properties>
-    <property name="quantity" value="2"/>
-   </properties>
-  </object>
-  <object name="forestuylom1" type="spawn" x="768" y="160" width="64" height="32">
-   <properties>
-    <property name="quantity" value="2"/>
-   </properties>
-  </object>
-  <object name="slargrum_5" type="spawn" x="768" y="224" width="64" height="32">
-   <properties>
-    <property name="quantity" value="2"/>
-   </properties>
-  </object>
-  <object name="undeadcr1" type="spawn" x="736" y="288" width="32" height="32"/>
-  <object name="forestuylom1" type="spawn" x="608" y="320" width="320" height="224">
+ <objectgroup name="Spawn" width="29" height="19">
+  <object name="vscaleb2" type="spawn" x="128" y="64" width="128" height="128"/>
+  <object name="vscale2" type="spawn" x="256" y="64" width="256" height="192">
   <properties>
    <property name="quantity" value="3"/>
   </properties>
  </object>
-  <object name="undeadcr1" type="spawn" x="576" y="320" width="352" height="224">
+  <object name="hanklbit2" type="spawn" x="704" y="64" width="160" height="128"/>
+  <object name="hanklbit3" type="spawn" x="704" y="192" width="64" height="32">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
  </object>
-  <object name="slargrum_6" type="spawn" x="480" y="448" width="96" height="96">
+  <object name="hanklbit3" type="spawn" x="704" y="288" width="32" height="32"/>
+  <object name="brtender1" type="spawn" x="672" y="352" width="224" height="192"/>
+  <object name="hanklbit2" type="spawn" x="704" y="384" width="160" height="128"/>
+  <object name="hanklbit4" type="spawn" x="416" y="384" width="224" height="160">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
  </object>
-  <object name="forestuylom1" type="spawn" x="384" y="480" width="32" height="64">
+  <object name="hanklbit4" type="spawn" x="352" y="480" width="32" height="64">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
  </object>
-  <object name="undeadcr2" type="spawn" x="288" y="512" width="32" height="64">
+  <object name="hanklbit2" type="spawn" x="256" y="512" width="32" height="64">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
  </object>
-  <object name="slargrum_6" type="spawn" x="64" y="416" width="224" height="160">
+  <object name="hanklbit1" type="spawn" x="64" y="448" width="160" height="128">
   <properties>
-    <property name="quantity" value="3"/>
+    <property name="quantity" value="2"/>
   </properties>
  </object>
-  <object name="forestuylom1" type="spawn" x="32" y="416" width="256" height="160"/>
 </objectgroup>
 <objectgroup name="Keys" width="29" height="19" visible="0"/>
 </map>
--- a/AndorsTrail/res/xml/lodar18.tmx
+++ b/AndorsTrail/res/xml/lodar18.tmx
@@ -138,7 +138,7 @@
   eJzNVssNgzAMTTlzgOnYoMyBmKBDVZzbBXrsrSobtBZENS92viD1ScgIgp/tOM8YI6NrlBeBd6X4Z9731865MbTGnFpmE3gtNO5H/bsfKt3fWC052HuMxRcTcvt4JPTwPY/Fx2uRW3vJJ8YSyleqUQ4vPjsi382+tvG8pfk6MbBYCFRzm5Mvt8v6bUz+0hq7t2TpOkfUUPKjcfOe5Wu61UfXbPWCo4qsK3Kjnwl4re0ad61F7J7OSuwI5N0DMf1OXJQL2TFRg0pAXK96sc+IOFP1Ucp9o9XG1a29wLlx33vWV9LZxeepujUrPRvsK5ynMMtK5oU2d0Oz9QbaEDpDyIvaTXZgeoiYoT98mJRYcs+uw638S1hg78bo8h4gnusBc7YEOENKzo7k26clqf64T82HNhNT+j8087RYJqGWqQjNvByfpTiK8x7w+wEGYn8P
  </data>
 </layer>
- <layer name="Walkable" width="30" height="30" visible="0">
+ <layer name="Walkable" width="30" height="30">
  <data encoding="base64" compression="zlib">
   eJzFUkEOwCAI8wn7lP//0k4mi1FKoTASk0VYW2rnM8YUn1Vq3BMHW0peRkflzh2eV+yT8byL19JhzVZmzKspwom0VOTBy4Eqw8twI88i2WK0ZfKGNHv66owh7IzPEYw118mLsubJhIXl8dfCVZTqbdndWXzF+YtXvUO1P2xeurizGr7/WrgM9947fWd2Oc15daP7yJsw/Zt+lluFGcmJ516d/733Ark71yk=
  </data>
@@ -193,82 +193,36 @@
   </properties>
  </object>
 </objectgroup>
- <objectgroup name="Spawn" width="30" height="30" visible="0">
-  <object name="slargrum_5" type="spawn" x="32" y="256" width="96" height="96"/>
-  <object name="undeadcr1" type="spawn" x="160" y="320" width="32" height="64">
+ <objectgroup name="Spawn" width="30" height="30">
+  <object name="zortak1" type="spawn" x="64" y="256" width="64" height="128"/>
+  <object name="zortak2" type="spawn" x="192" y="384" width="32" height="64"/>
+  <object name="zortaks" type="spawn" x="64" y="448" width="192" height="160"/>
+  <object name="vscale2" type="spawn" x="96" y="832" width="32" height="64">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
  </object>
-  <object name="zortak_3" type="spawn" x="192" y="416" width="32" height="32"/>
-  <object name="slargrum_6" type="spawn" x="64" y="448" width="192" height="160">
+  <object name="vscale2" type="spawn" x="192" y="768" width="32" height="64">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
  </object>
-  <object name="undeadcr2" type="spawn" x="32" y="800" width="160" height="128">
-   <properties>
-    <property name="quantity" value="2"/>
-   </properties>
-  </object>
-  <object name="zortak_1" type="spawn" x="192" y="768" width="32" height="64">
-   <properties>
-    <property name="quantity" value="2"/>
-   </properties>
-  </object>
-  <object name="slargrum_7" type="spawn" x="224" y="768" width="128" height="128">
-   <properties>
-    <property name="quantity" value="2"/>
-   </properties>
-  </object>
-  <object name="zortak_3" type="spawn" x="320" y="672" width="160" height="192">
-   <properties>
-    <property name="quantity" value="3"/>
-   </properties>
-  </object>
-  <object name="slargrum_6" type="spawn" x="480" y="672" width="256" height="192">
-   <properties>
-    <property name="quantity" value="4"/>
-   </properties>
-  </object>
-  <object name="undeadcr3" type="spawn" x="736" y="832" width="96" height="64"/>
-  <object name="slargrum_6" type="spawn" x="864" y="768" width="32" height="64">
-   <properties>
-    <property name="quantity" value="2"/>
-   </properties>
-  </object>
-  <object name="xalirg_1" type="spawn" x="672" y="512" width="256" height="128">
-   <properties>
-    <property name="quantity" value="2"/>
-   </properties>
-  </object>
-  <object name="zortak_3" type="spawn" x="352" y="512" width="320" height="96">
-   <properties>
-    <property name="quantity" value="3"/>
-   </properties>
-  </object>
-  <object name="undeadcr2" type="spawn" x="672" y="416" width="64" height="32">
-   <properties>
-    <property name="quantity" value="2"/>
-   </properties>
-  </object>
-  <object name="zortak_4" type="spawn" x="640" y="352" width="32" height="32"/>
-  <object name="slargrum_8" type="spawn" x="576" y="256" width="64" height="32">
-   <properties>
-    <property name="quantity" value="2"/>
-   </properties>
-  </object>
-  <object name="undeadcr3" type="spawn" x="608" y="192" width="32" height="32"/>
-  <object name="xalirg_1" type="spawn" x="512" y="32" width="224" height="160">
-   <properties>
-    <property name="quantity" value="3"/>
-   </properties>
-  </object>
-  <object name="zortak_3" type="spawn" x="736" y="32" width="192" height="96">
+  <object name="vscale3" type="spawn" x="256" y="672" width="640" height="224">
+   <properties>
+    <property name="quantity" value="6"/>
+   </properties>
+  </object>
+  <object name="morkins" type="spawn" x="352" y="512" width="128" height="64"/>
+  <object name="morkin1" type="spawn" x="576" y="544" width="96" height="32"/>
+  <object name="morkin1" type="spawn" x="672" y="512" width="224" height="96"/>
+  <object name="morkin1" type="spawn" x="640" y="352" width="32" height="32"/>
+  <object name="morkins" type="spawn" x="736" y="160" width="160" height="192">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
  </object>
+  <object name="morkin1" type="spawn" x="608" y="192" width="32" height="32"/>
+  <object name="morkin2" type="spawn" x="512" y="64" width="384" height="96"/>
 </objectgroup>
 <objectgroup name="Keys" width="30" height="30" visible="0"/>
 </map>
--- a/AndorsTrail/res/xml/lodar19.tmx
+++ b/AndorsTrail/res/xml/lodar19.tmx
@@ -128,17 +128,17 @@
   eJztk7ENgDAMBBEFzMo+YQRgBGAAmkyFLLBkrE+IA0gUKa6xov/Yfru6qtxPGAFvak9An2oLYHjgRZpde0BaK9CnmgfMN95oRtzHKnz9WdP6sX+zd+qMuA8nfHtRszAbZoT6yPV1xhmhXW/NN5kN7Z13Tb45mU39q947exKWzCKtQfnr3qQ+eyJCmQ1pcc7kfereUkGZjWn5+nqfd73FQDcRe8++uX6FQsHODidBqVg=
  </data>
 </layer>
- <layer name="Objects" width="30" height="20" visible="0">
+ <layer name="Objects" width="30" height="20">
  <data encoding="base64" compression="zlib">
   eJytVstKxEAQnInXBBI8eNaLH7J+i3+g4NXbetOD4uL/eF5BBR+oURDUrK+bumqX6XbKSeIDbFgmmZme6qmu7uxD7lxSOPfwj6OXsZTxKHUf9izjUN5dUa9hbPPh9Xhf1/yXdbErwXpS3LnMfVqlcw0MtZEPzwMfMO7l7JH4TspZd3kT80bPXRefU3kushBHPzoTGJs6h7Pm5ffqa4wNHS1Gw27DtPtdyvtL6hpmGGtJHQNjYK6Nu9Wkgx8dBxT7rSeeFGdFnheJb44bdpI2z5zI6hwZtuVgRbGMI4yI/404Aibuf0wa28ldQzMjXcc+04DPgk6ADX62fH2f7zjqUW5hlvszyhtryuxQ9l3r3oI4svNOdQ0aizmy/C7o3mEe/A3X8hLXRWxcJ+M03AM8HKQhlqtIU8jHLeW6zIM2Y8129QO2Ss/i/gAbEe6y5uNN84HcgW8++yfNmiGnqIMx1WNfNdb3QXfAmRaeZ7KQL4uxs15c4H8Q8XSgfa8gjWMvzt7UulzT+Qu6O3joaQx8n6HqfVXrzWp6Ow88JaoTix+83aW1vuHb15q7JjzWi+XihPxt7z71cOQC77OkZ+hmTOcCz/TLWpvSXtCm1eeI9yr9qk+22PeIer/V+mQWYvmcb9Eq56DUns8cdn3vKorLExfwL6lWLX7+liX6e1SeeuTP94t94hhg6A+Gt6T5Lak24X+ehr4cc9dVt7sy7uXfY8NeqX+g31ke42/Yb/5DwMfqxnzb7l+1aKLrLr/9/xLH2/YN/sv4DpAYDb8=
  </data>
 </layer>
- <layer name="Above" width="30" height="20" visible="0">
+ <layer name="Above" width="30" height="20">
  <data encoding="base64" compression="zlib">
   eJztVdsNgCAMZASdzg1gUvXfSWADIZEEL4VSqfHH+wLBuz7OaswPN33DHeKZv869Qgyl1lKsb9zzODfCTvc13g0DuYVaHgQWrT4Ka4S6Kc7cWyr32nMJUo0tw1HG8NRf2EtOU8LVutej01NDjsuBd7XAcVFe7fXFPtBPjKvkeepJDT9THj0aNZLETfFQ+jW0ak1956iX9zUenHFULda43zrel2JkNnDaGv80Thtn7duaUpyo1EUm
  </data>
 </layer>
- <layer name="Walkable" width="30" height="20" visible="0">
+ <layer name="Walkable" width="30" height="20">
  <data encoding="base64" compression="zlib">
   eJy9k8sNwCAMQxmhS7H/Sj1VilDcGOcTiQOf8IxJ9rPWbho2uhiId8Yk0653Mj3OpN8Vf53VGnHRv6hamXw1mLsyem/1TdYMw6zUFPEqvPjyPO/ZelE88PLtHDHOtfM8epsSbM9Ee3915OWznjE5ivaqXkC1jDxQ+0B9e/beDL+beTNeGH+Hzg==
  </data>
@@ -163,81 +163,65 @@
   </properties>
  </object>
 </objectgroup>
- <objectgroup name="Spawn" width="30" height="20" visible="0">
-  <object name="zortak_3" type="spawn" x="608" y="32" width="192" height="96">
+ <objectgroup name="Spawn" width="30" height="20">
+  <object name="vscale3" type="spawn" x="608" y="64" width="192" height="64">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
  </object>
-  <object name="slargrum_6" type="spawn" x="832" y="64" width="64" height="96">
+  <object name="vscale4" type="spawn" x="832" y="64" width="64" height="96">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
  </object>
-  <object name="undeadcr2" type="spawn" x="800" y="192" width="32" height="64">
+  <object name="vscale3" type="spawn" x="768" y="192" width="32" height="64">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
  </object>
-  <object name="zortak_2" type="spawn" x="704" y="224" width="32" height="64">
+  <object name="vscale2" type="spawn" x="384" y="192" width="384" height="128">
+   <properties>
+    <property name="quantity" value="3"/>
+   </properties>
+  </object>
+  <object name="vscaleb2" type="spawn" x="96" y="160" width="128" height="96"/>
+  <object name="vscaleb1" type="spawn" x="224" y="160" width="160" height="128">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
  </object>
-  <object name="undeadcr3" type="spawn" x="544" y="256" width="160" height="64">
+  <object name="hanklbit3" type="spawn" x="384" y="416" width="32" height="32"/>
+  <object name="hanklbit2" type="spawn" x="416" y="352" width="160" height="192">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
  </object>
-  <object name="slargrum_7" type="spawn" x="416" y="224" width="128" height="64">
-   <properties>
-    <property name="quantity" value="2"/>
-   </properties>
-  </object>
-  <object name="zortak_4" type="spawn" x="96" y="160" width="128" height="96"/>
-  <object name="undeadcr3" type="spawn" x="224" y="160" width="160" height="128">
-   <properties>
-    <property name="quantity" value="2"/>
-   </properties>
-  </object>
-  <object name="undeadcr2" type="spawn" x="384" y="224" width="32" height="32"/>
-  <object name="slargrum_5" type="spawn" x="576" y="320" width="64" height="96">
-   <properties>
-    <property name="quantity" value="2"/>
-   </properties>
-  </object>
-  <object name="forestuylom1" type="spawn" x="384" y="416" width="32" height="32"/>
-  <object name="undeadcr1" type="spawn" x="416" y="352" width="160" height="192">
+  <object name="hanklbit2" type="spawn" x="576" y="416" width="256" height="192">
   <properties>
    <property name="quantity" value="4"/>
   </properties>
  </object>
-  <object name="forestuylom1" type="spawn" x="576" y="416" width="256" height="192">
-   <properties>
-    <property name="quantity" value="4"/>
-   </properties>
-  </object>
-  <object name="undeadcr1" type="spawn" x="672" y="352" width="160" height="64"/>
-  <object name="slargrum_5" type="spawn" x="832" y="320" width="96" height="128">
-   <properties>
-    <property name="quantity" value="2"/>
-   </properties>
-  </object>
-  <object name="undeadcr1" type="spawn" x="320" y="416" width="32" height="64">
-   <properties>
-    <property name="quantity" value="2"/>
-   </properties>
-  </object>
-  <object name="forestuylom1" type="spawn" x="256" y="416" width="32" height="64">
-   <properties>
-    <property name="quantity" value="2"/>
-   </properties>
-  </object>
-  <object name="slargrum_6" type="spawn" x="32" y="384" width="224" height="192">
+  <object name="hanklbit1" type="spawn" x="672" y="320" width="224" height="96">
+   <properties>
+    <property name="quantity" value="2"/>
+   </properties>
+  </object>
+  <object name="hanklbit2" type="spawn" x="320" y="416" width="32" height="64">
+   <properties>
+    <property name="quantity" value="2"/>
+   </properties>
+  </object>
+  <object name="hanklbit2" type="spawn" x="256" y="416" width="32" height="64">
+   <properties>
+    <property name="quantity" value="2"/>
+   </properties>
+  </object>
+  <object name="hanklbit3" type="spawn" x="32" y="384" width="224" height="192">
   <properties>
    <property name="quantity" value="4"/>
   </properties>
  </object>
+  <object name="brtender2" type="spawn" x="64" y="352" width="128" height="256"/>
 </objectgroup>
 <objectgroup name="Keys" width="30" height="20" visible="0"/>
 </map>
--- a/AndorsTrail/res/xml/lodar1cave0.tmx
+++ b/AndorsTrail/res/xml/lodar1cave0.tmx
@@ -1,125 +1,124 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="20" height="19" tilewidth="32" tileheight="32">
 <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="576" height="192"/>
 </tileset>
 <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="576" height="192"/>
 </tileset>
 <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="576" height="192"/>
 </tileset>
 <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="480" height="256"/>
 </tileset>
 <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="480" height="256"/>
 </tileset>
 <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="512" height="256"/>
 </tileset>
 <layer name="Ground" width="20" height="19">
  <data encoding="base64" compression="zlib">
@@ -150,23 +149,23 @@
  </object>
 </objectgroup>
 <objectgroup name="Spawn" width="20" height="19">
-  <object name="gnome_1" type="spawn" x="224" y="128" width="64" height="64"/>
-  <object name="gnome_1" type="spawn" x="320" y="224" width="32" height="160"/>
-  <object name="gnome_2" type="spawn" x="448" y="160" width="128" height="192">
+  <object name="mudfiend" type="spawn" x="224" y="128" width="64" height="64"/>
+  <object name="mudfiend" type="spawn" x="320" y="224" width="32" height="160"/>
+  <object name="mudfiend" type="spawn" x="448" y="160" width="128" height="192">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
  </object>
-  <object name="gnome_1" type="spawn" x="384" y="288" width="192" height="160">
+  <object name="mudfiend" type="spawn" x="128" y="480" width="32" height="32"/>
+  <object name="mudfiend" type="spawn" x="192" y="416" width="32" height="128"/>
+  <object name="mudfiend" type="spawn" x="288" y="384" width="192" height="192">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
  </object>
-  <object name="gnome_2" type="spawn" x="128" y="480" width="32" height="32"/>
-  <object name="gnome_2" type="spawn" x="192" y="416" width="32" height="128"/>
-  <object name="gnome_1" type="spawn" x="288" y="384" width="192" height="192">
+  <object name="cavebat1" type="spawn" x="64" y="128" width="512" height="448">
   <properties>
-    <property name="quantity" value="2"/>
+    <property name="quantity" value="4"/>
   </properties>
  </object>
 </objectgroup>
--- a/AndorsTrail/res/xml/lodar2.tmx
+++ b/AndorsTrail/res/xml/lodar2.tmx
@@ -128,19 +128,19 @@
   eJzt08ENgCAMhWHCwcFdAVfAFXABLkwlxDQ2jdc+jL7Dd+2fNG1dQqg/sMYLoiE2xauZTMf6Wjf32buC6pY++1AyqDu0eCum7dl92kGa0NX3xq4v+S90V/4L3R3apC4REdFbnBhFvwM=
  </data>
 </layer>
- <layer name="Objects" width="30" height="30" visible="0">
+ <layer name="Objects" width="30" height="30">
  <data encoding="base64" compression="zlib">
-   eJy9VsFKw0AQ3TbXCWzw4Cf4IfaXFBQ8iDfBgxc/Sc8etGBbKFgoNG2p9WabYobdbSaT2d1UxQFZN93Mm3nzZjZrrVQ3U2r9D2unXFVm1r/yFcJw63VXqTkoNYP28Um+cf0o15VuvocYaJfl/kobrB2ovfnixv0CjE/JdyhWfG+qjf/bcr3TFV4s7jZYEpfLEvMsNRh9i5eDjPlTbQwIb+jbcUrtoWP/OUBLUj6oizeC5/xRTvsMm5+NYWEOI8tbARVfzgeeobVAQ/1syr/7bnX0ScvYVFNJanLyWaz+3IZg8ndxuHcQ81HX97MDdBDqMbSt9ZWlFtuefSnPvOp6nWK1oJjI/Ukaxh5b7CnLbwn1/U7IV+pvWo9e2vyd5vLlzlpd8DqhYRw8funcaVr5GbNYpfO5MK84NzMBu5G/PTe0Go7VJkmb+uQ+h4QX6XfsL5djz/pbgIrOc9TWyoM5Yv543TZCn910zDw5T8kcC+TPMVHvE6j7ntE8PDxRQx+5uxs82GJdmW9n6GvrqSPX7wQq3qR+8MUtPX+Dpm6dT5xJOdSxC7Ln+j7kPkIbBHpM6p25h582d0QbPkK9NmbYe514tI/x+7QR6hVpPn9CvSY4vzLWf6E5JT0PfYehbUg/uN5wVoC/fjEu36GaM4kwp4/B5qTMXZ6T78nE7nFWLMEfv/RtUNiecT24IJy6mdwhMxItdGej5SwGeg9NgOhGkVmTNb+/0ChOm97x2Zbw96yr5xeR+S/1b4xb6U4vWN4SZmxetdFviA9ffvj+EdHcIfPqtyuN/RuE9oxb
+   eJy9Vs1Kw0AQ3jbXCWzw4CP4IPaVFBQ8iDfBgxcfSc8etGBbKFgoNG2p9WabYobdbSaT2d1UxYGy3WR2vvn5ZjZrrVQ3U2r9D2unXFVm1r+yFcJw63VXqTkoNYP2/km2cf0o15VunkMMlMtyf6UN1g7UXnx+434BxqZkO+QrnptqY/+2XO90hRfzuw2WlMtliXmWGoy+xctBxvwpNwYkb2jb5ZTKQ8f+OYBLUjzIizeC5+zRnPYZNteNYWEMI5u3Aqp8ORuoQ2uBgvzZlL/7bqX6pGVsyqkkNTH5JFZ/LkMw8Ts/3BnEfNT1/ewAHoR6DGVrbWWpxba6L6XOq67XKVYLiom5P0nD2GOLPWXxLaG+3wnxSv1N69FLm+9pLF9O1/KC1wkF/eD+S3qnaWVnzHyV9HNhXvHczATsRvxWb2g5HKtNkjb5yW0OSV6k99hfLsaetbcAFZ3nyK2VB3PE7PG6bYQ+u+mYeXKekjkWiJ9jIt8nULc9o3F48kQFbeTubvBgi3Vltp2gra2njpy/E6jyJvWDz2/p+Rs0eets4kzKoY5dkD3n9yH3Ecog0GNS78w9+WlzR7TJR6jXxgx7zxMP99F/HzdCvSLN50+o1wTnV8b6LzSnpOeh7zCUDekH1xtOCvDXL5bLd6jmTCLM6WOwMSlzl+fkezKxe5wVS/D7L30bFLZnXA8uSE7dTO6QGYkSurNRcuYDvYcmQHijyKzJmt9fKBSnTe/4ZEvy96yr5xeR+S/1byy30p1esLjdvRM6H+Jpm+dcfPHh+SPCuUPm1W9X6vs3limMaw==
  </data>
 </layer>
- <layer name="Above" width="30" height="30" visible="0">
+ <layer name="Above" width="30" height="30">
  <data encoding="base64" compression="zlib">
   eJztVlsKwCAM8wje/z7D67gbjH0MpDQSMfFr+RlMbfpuS/nhRK+l3NXL0YL8bubLoObM/BbtdPK5YzbLix3u8e3HMX6Z90zOXuBckQcz7nimjtOqPNZexqcMN6tfdm+mq5J7Fe5ac3LHGlMCycziuKND7BnZf4QG7rN1gfrSqiyl71dlqbl3e6hzTr5AsTmxdyBfn9izZlByIz8iG+OMV+iS7QzsjMj2DuatK39QD1XUGsN9ikuBB44eZGk=
  </data>
 </layer>
- <layer name="Walkable" width="30" height="30" visible="0">
+ <layer name="Walkable" width="30" height="30">
  <data encoding="base64" compression="zlib">
-   eJzlklEKwCAMQz3CLuX9r7QvYUg1pk11YwHZ2EpfE1uvUuoPTtMJZjbX0q4cM5gzqZmj3DIZqHeUzfJUu5R9JwomqvdkpfLD1LCzKfqq/Xp2YpWp4KJ+q4ow+x7MLFGfbD8Pf9VPdD+Uu/YFtmoedM/Mv4x82rsldf4WK+odzT0SWzOr6+tn3z1++l7PJ5pZva+7mCjLt54bFBLdzQ==
+   eJzlkl0KgDAMg3cEL7X7X8mngYz+pU0nYmAoWvolXec1xvzBWXqD2c2VdGqOHUxLbKY2t06G17vKRnmsXeq+EwbTq8/MipUHqUG9Mfqy82Z2IspkcL1+UVWYew/ESzUn2i/Dj+ap7gdz177AZvnx7hn51zGf9S6JPX+JVc3u+daE1lh1e731PZNn7/V8ep7Z+6p56Ton8jHPDW+m3iI=
  </data>
 </layer>
 <objectgroup name="Mapevents" width="30" height="30">
@@ -163,104 +163,83 @@
   </properties>
  </object>
 </objectgroup>
- <objectgroup name="Spawn" width="30" height="30" visible="0">
-  <object name="forestregral1" type="spawn" x="64" y="704" width="32" height="64">
+ <objectgroup name="Spawn" width="30" height="30">
+  <object name="forestfly1" type="spawn" x="64" y="704" width="128" height="128">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
  </object>
-  <object name="forestwesral1" type="spawn" x="96" y="736" width="96" height="96"/>
-  <object name="forestfly2" type="spawn" x="256" y="800" width="32" height="64">
-   <properties>
-    <property name="quantity" value="2"/>
-   </properties>
-  </object>
-  <object name="forestregral1" type="spawn" x="288" y="800" width="192" height="64">
-   <properties>
-    <property name="quantity" value="2"/>
-   </properties>
-  </object>
-  <object name="forestregral1" type="spawn" x="480" y="736" width="256" height="192">
-   <properties>
-    <property name="quantity" value="4"/>
-   </properties>
-  </object>
-  <object name="forestwesral2" type="spawn" x="736" y="768" width="128" height="96">
-   <properties>
-    <property name="quantity" value="2"/>
-   </properties>
-  </object>
-  <object name="forestregral1" type="spawn" x="800" y="736" width="32" height="32"/>
-  <object name="zortak_4" type="spawn" x="736" y="96" width="160" height="96">
-   <properties>
-    <property name="quantity" value="2"/>
-   </properties>
-  </object>
-  <object name="forestfly3" type="spawn" x="704" y="576" width="128" height="160">
-   <properties>
-    <property name="quantity" value="2"/>
-   </properties>
-  </object>
-  <object name="forestregral1" type="spawn" x="608" y="480" width="192" height="96">
+  <object name="hanklbit1" type="spawn" x="192" y="800" width="32" height="32"/>
+  <object name="hanklbit1" type="spawn" x="352" y="832" width="32" height="32"/>
+  <object name="forestfly1" type="spawn" x="416" y="736" width="224" height="192">
   <properties>
    <property name="quantity" value="3"/>
   </properties>
  </object>
-  <object name="forestwesral2" type="spawn" x="448" y="320" width="192" height="256">
-   <properties>
-    <property name="quantity" value="3"/>
-   </properties>
-  </object>
-  <object name="forestregral1" type="spawn" x="416" y="320" width="224" height="256">
+  <object name="lodar_fg1" type="spawn" x="672" y="832" width="32" height="32"/>
+  <object name="forestfly1" type="spawn" x="768" y="768" width="128" height="96">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
  </object>
-  <object name="forestwesral2" type="spawn" x="320" y="512" width="128" height="160">
-   <properties>
-    <property name="quantity" value="3"/>
-   </properties>
-  </object>
-  <object name="forestregral1" type="spawn" x="256" y="480" width="32" height="64">
+  <object name="forestfly2" type="spawn" x="800" y="736" width="32" height="32"/>
+  <object name="forestfly1" type="spawn" x="672" y="544" width="128" height="96">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
  </object>
-  <object name="forestwesral2" type="spawn" x="96" y="448" width="160" height="160">
-   <properties>
-    <property name="quantity" value="3"/>
-   </properties>
-  </object>
-  <object name="forestfly3" type="spawn" x="128" y="384" width="64" height="32">
+  <object name="forestfly1" type="spawn" x="736" y="640" width="96" height="96">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
  </object>
-  <object name="forestwesral1" type="spawn" x="128" y="320" width="64" height="32">
+  <object name="forestfly1" type="spawn" x="576" y="480" width="160" height="64">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
  </object>
-  <object name="forestregral1" type="spawn" x="160" y="224" width="224" height="64">
+  <object name="brtender1" type="spawn" x="448" y="320" width="192" height="128"/>
+  <object name="forestfly1" type="spawn" x="320" y="544" width="128" height="128">
   <properties>
    <property name="quantity" value="3"/>
   </properties>
  </object>
-  <object name="forestwesral2" type="spawn" x="384" y="160" width="192" height="96">
+  <object name="forestfly1" type="spawn" x="96" y="448" width="160" height="160">
   <properties>
    <property name="quantity" value="3"/>
   </properties>
  </object>
-  <object name="forestregral1" type="spawn" x="576" y="128" width="128" height="160">
+  <object name="forestfly2" type="spawn" x="128" y="384" width="64" height="32">
   <properties>
-    <property name="quantity" value="4"/>
+    <property name="quantity" value="2"/>
   </properties>
  </object>
-  <object name="forestwesral2" type="spawn" x="704" y="256" width="192" height="160">
+  <object name="forestfly2" type="spawn" x="128" y="320" width="64" height="32">
   <properties>
-    <property name="quantity" value="4"/>
+    <property name="quantity" value="2"/>
   </properties>
  </object>
+  <object name="forestfly1" type="spawn" x="224" y="224" width="160" height="64">
+   <properties>
+    <property name="quantity" value="2"/>
+   </properties>
+  </object>
+  <object name="forestfly1" type="spawn" x="384" y="128" width="320" height="160">
+   <properties>
+    <property name="quantity" value="3"/>
+   </properties>
+  </object>
+  <object name="hanklbit1" type="spawn" x="736" y="256" width="64" height="64">
+   <properties>
+    <property name="quantity" value="2"/>
+   </properties>
+  </object>
+  <object name="khakin3" type="spawn" x="736" y="96" width="160" height="96">
+   <properties>
+    <property name="quantity" value="2"/>
+   </properties>
+  </object>
+  <object name="lodar_fg2" type="spawn" x="800" y="320" width="96" height="96"/>
 </objectgroup>
- <objectgroup name="Keys" width="30" height="30"/>
+ <objectgroup name="Keys" width="30" height="30" visible="0"/>
 </map>
--- a/AndorsTrail/res/xml/lodar20.tmx
+++ b/AndorsTrail/res/xml/lodar20.tmx
@@ -138,7 +138,7 @@
   eJydlVESwiAMRNET0NN5AzmH08P1vyepN7DRycyyJiR0f2oN+wgJhVKSWkq5LfAEPapve93j/9fz9wEMj6ceGfuuv3fxIktjLcFD6ZrUL2rAQcbqrIlzYAlDOU+Kt0SOzBQGc3CuqzrIu1WbZ60xYqky+bXaP0eKeMLYjV56suqKewvjXg9Gyux3T1wPrrHwvD1osTB/q1+YHzN5nsxaeIz6o7ktcf6zc7Ms1ii/K723NOqXxrI9RfFesfwzTDn79sR4zDfK++/75rtmMUylZ858T9/zO8HsxgdSpndHeuegJ66Z3pFeHbWGM/sEPawr5z17Mj3xesieUWzEZI8Vmz1DkLcFtfsAJCNdrg==
  </data>
 </layer>
- <layer name="Walkable" width="20" height="30" visible="0">
+ <layer name="Walkable" width="20" height="30">
  <data encoding="base64" compression="zlib">
   eJzNklEKwDAIQ3uEXsr7X2k/G4wyNU1SmCAU2j41JuYYcecTMflcQ2GtPPStWvPNc7H+wqs0YvfWhdIf87+aVZ1N9VzGYrWrWNWZ9RTbJ6OJynSy2P6yfygLiR0fZr10fEUzF7Or4WS6vNMxd/RBZmX0Rmc+zXTtBNHwxA6/7i5ntpa/
  </data>
@@ -187,59 +187,39 @@
   </properties>
  </object>
 </objectgroup>
- <objectgroup name="Spawn" width="20" height="30" visible="0">
-  <object name="slargrum_7" type="spawn" x="32" y="768" width="224" height="160">
+ <objectgroup name="Spawn" width="20" height="30">
+  <object name="vscale2" type="spawn" x="416" y="864" width="64" height="32">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
  </object>
-  <object name="undeadcr2" type="spawn" x="32" y="736" width="224" height="192"/>
-  <object name="undeadcr2" type="spawn" x="416" y="864" width="64" height="32">
+  <object name="vscale1" type="spawn" x="416" y="800" width="64" height="32">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
  </object>
-  <object name="slargrum_6" type="spawn" x="416" y="800" width="64" height="32">
+  <object name="morkins" type="spawn" x="128" y="544" width="192" height="128"/>
+  <object name="morkin1" type="spawn" x="64" y="576" width="64" height="32"/>
+  <object name="morkin1" type="spawn" x="320" y="576" width="160" height="192">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
  </object>
-  <object name="undeadcr3" type="spawn" x="128" y="544" width="192" height="128">
+  <object name="morkin1" type="spawn" x="320" y="544" width="32" height="32"/>
+  <object name="morkin1" type="spawn" x="320" y="480" width="32" height="32"/>
+  <object name="morkin1" type="spawn" x="160" y="352" width="288" height="128"/>
+  <object name="morkin1" type="spawn" x="64" y="288" width="96" height="96"/>
+  <object name="morkin1" type="spawn" x="128" y="192" width="288" height="64">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
  </object>
-  <object name="zortak_3" type="spawn" x="64" y="576" width="32" height="32"/>
-  <object name="slargrum_7" type="spawn" x="320" y="576" width="160" height="192">
-   <properties>
-    <property name="quantity" value="3"/>
-   </properties>
-  </object>
-  <object name="zortak_4" type="spawn" x="320" y="544" width="32" height="32"/>
-  <object name="slargrum_8" type="spawn" x="320" y="480" width="32" height="32"/>
-  <object name="undeadcr3" type="spawn" x="160" y="352" width="288" height="128">
+  <object name="morkins" type="spawn" x="352" y="64" width="64" height="32"/>
+  <object name="vscale2" type="spawn" x="64" y="768" width="160" height="128">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
  </object>
-  <object name="zortak_3" type="spawn" x="256" y="256" width="32" height="96"/>
-  <object name="slargrum_6" type="spawn" x="64" y="320" width="32" height="64">
-   <properties>
-    <property name="quantity" value="2"/>
-   </properties>
-  </object>
-  <object name="zortak_2" type="spawn" x="128" y="256" width="32" height="64">
-   <properties>
-    <property name="quantity" value="2"/>
-   </properties>
-  </object>
-  <object name="slargrum_7" type="spawn" x="128" y="192" width="288" height="64">
-   <properties>
-    <property name="quantity" value="2"/>
-   </properties>
-  </object>
-  <object name="undeadcr3" type="spawn" x="352" y="96" width="32" height="96"/>
-  <object name="slargrum_8" type="spawn" x="352" y="64" width="64" height="32"/>
 </objectgroup>
 <objectgroup name="Keys" width="20" height="30"/>
 </map>
--- a/AndorsTrail/res/xml/lodar21.tmx
+++ b/AndorsTrail/res/xml/lodar21.tmx
@@ -128,17 +128,17 @@
   eJzF0s0NgzAMhmGLQ1mCFchenYcyAskIJQP0wlTFAkufrOC4VSQOr/iR8sgCx44onr2MZuP950E07tewt0KLYXu9DXoru8V8aC9/eHo+NPA5OT2+x9iYlPnsiXLFCxceN6kz7Fn/XWa7y6vtZQtP9jQ5PL17ugQ7lh2e7EkslE5Ddgx35coTcy2UC2eCw+Nw13EeDGereZ5CA2/ojrT1i2cZXs9reDz9ne/yvnY144E=
  </data>
 </layer>
- <layer name="Objects" width="20" height="20" visible="0">
+ <layer name="Objects" width="20" height="20">
  <data encoding="base64" compression="zlib">
   eJx1VM1OwzAMTrtrKrXagQOPw96BJ+HAI+w4kEBDexDegDuXSXSI8SNN6tYy4LbBwN9iN05WLEVuY+fzZ8dOUhhjaCWsU1pP1uylIl3T+syd/ZW+p7mzvVnn18+Muc+d74rP3STGC2N/W/+PGB90pqCzM9qf0yppNezzQrYTsi1IDwmr0XhKlgpzz59kS3tJ5nhDEPeW1jp3MceEtWO8Ueq02CAbzqPh3CDg0sbiukjMCePJeeED7GBPn2WRutaKHzT20yLkhz3BHDL/8yzEkrqe5ubgTgNMZcM/anJB+oF4PFvvK/wqxa/usGvuqFnZkaO+98sk5BDbY86QxoY+UhMdH/3yw7EXkT3m3MWv3S983pCV/Z8f/KQ3YmyZg7vcc6y433tZd8yyo6cFY8L3NM1D+4bPzFhL34w5/ns0P4KBWTlOPbedurctfz9aV8uR8vtNHJdr5jOgXI7Yf6DyQq6pygExpVa1miERzOoZ93TJ3Brek9hyjzLf6FmpKaRR9w8BRi/zMdtZ59i69774rLx/a+sxpCZyHj28UjngPURusM07ekTXeWl9jLinoXW/xP3e9qDxsRvFa67rylr3i54DzU/e7qvkEBvSV2+N+CCHP0lxvmM=
  </data>
 </layer>
- <layer name="Above" width="20" height="20" visible="0">
+ <layer name="Above" width="20" height="20">
  <data encoding="base64" compression="zlib">
   eJxjYMAEHwUQ7A9I7HABTLX4xAmBoWYeKCxAYYNNHB0wCeI3j5hw/YgmjmxmOlAuTQC7/dJM2M3DZiajIKobsPkFGRCSh5kPchshtcQCdDcTA4ixm1ruw2ZWOhXNRo5ragB8ZiGH9fEBjD96mnlBAGEmLI+PAuIAAO1JIMI=
  </data>
 </layer>
- <layer name="Walkable" width="20" height="20" visible="0">
+ <layer name="Walkable" width="20" height="20">
  <data encoding="base64" compression="zlib">
   eJxzFWBgcMWCYYBUOVwYmx5sgBIz0c0h1TxCZpJjHrI7qGEWLvPINQvdPErMwRUP1DKPmmqpqY6a7iM13LABUuOdUvMIqUWWw6YOFyDH7+h2kZPWsNGjGDsGABg3aEM=
  </data>
@@ -163,46 +163,23 @@
   </properties>
  </object>
 </objectgroup>
- <objectgroup name="Spawn" width="20" height="20" visible="0">
-  <object name="undeadcr2" type="spawn" x="224" y="64" width="64" height="32">
+ <objectgroup name="Spawn" width="20" height="20">
+  <object name="morkins" type="spawn" x="224" y="64" width="96" height="64"/>
+  <object name="brtender1" type="spawn" x="416" y="384" width="96" height="96"/>
+  <object name="hanklbit3" type="spawn" x="64" y="384" width="128" height="160">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
  </object>
-  <object name="slargrum_8" type="spawn" x="288" y="160" width="32" height="96"/>
-  <object name="zortak_3" type="spawn" x="256" y="256" width="128" height="128">
+  <object name="hanklbit4" type="spawn" x="224" y="480" width="32" height="32"/>
+  <object name="hanklbit4" type="spawn" x="320" y="448" width="32" height="32"/>
+  <object name="vscale3" type="spawn" x="288" y="160" width="32" height="64"/>
+  <object name="vscale1" type="spawn" x="256" y="224" width="128" height="160">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
  </object>
-  <object name="undeadcr3" type="spawn" x="352" y="192" width="32" height="32"/>
-  <object name="undeadcr2" type="spawn" x="352" y="32" width="160" height="160">
-   <properties>
-    <property name="quantity" value="3"/>
-   </properties>
-  </object>
-  <object name="forestuylom2" type="spawn" x="32" y="288" width="128" height="256">
-   <properties>
-    <property name="quantity" value="3"/>
-   </properties>
-  </object>
-  <object name="slargrum_5" type="spawn" x="192" y="480" width="32" height="64">
-   <properties>
-    <property name="quantity" value="2"/>
-   </properties>
-  </object>
-  <object name="undeadcr2" type="spawn" x="256" y="480" width="32" height="64">
-   <properties>
-    <property name="quantity" value="2"/>
-   </properties>
-  </object>
-  <object name="forestuylom2" type="spawn" x="352" y="448" width="32" height="64">
-   <properties>
-    <property name="quantity" value="2"/>
-   </properties>
-  </object>
-  <object name="tondar" type="spawn" x="480" y="384" width="32" height="32"/>
-  <object name="undeadcr2" type="spawn" x="416" y="416" width="32" height="64">
+  <object name="vscale2" type="spawn" x="352" y="64" width="160" height="160">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
--- a/AndorsTrail/res/xml/lodar3.tmx
+++ b/AndorsTrail/res/xml/lodar3.tmx
@@ -128,19 +128,19 @@
   eJzllc0NwjAMRouFYFbWYAXCCAU2SOHeS6eikbDimC+/FBDi8CRHTf3cWE7HTdeNX2BPnqXylOQzFNLiPNBzHsc5kQ/tr60deZ3zCt7jfMgbo6Z26WxxSY7Andvb6kp5Y31lcs9/wbteef7BK8+5n9cnwae8dl4Pgl7t12sJqrPU65jIY9U3WgrPxIgY1Vnjzd1d8kx2Wx9Pmbokqfs2NVt8Hs7LMerVRfWNQfdt6T/CPLwco17dKOybrjFFac9e+ecidM9ic7a0F80XmrN3ePV8yTlj9x3rrpGs
  </data>
 </layer>
- <layer name="Objects" width="30" height="20" visible="0">
+ <layer name="Objects" width="30" height="20">
  <data encoding="base64" compression="zlib">
-   eJyFVktuE0EQ7RrErkfMKCCOwAGAE5A75CQgsYSs8A4WRPGFsoANq0hOLIwVKRJhEj67kJj0U1W5a8rdpqRWe/pT79W3HfoQKI1g5iaN312ea+uYf3Xju3ZexBB+dnzGz5CzyPN+E8K3uImh5z2mcnrT8G+vG/qqdoh8N9jLWLahZL/aW9OtfK2uZTc+cyz277aZz3mX+ei912n/2nDzvrD2rHkH9ov6opE1EqyTOLZf5V7L2D8ixw3nHkfWVYoLzn5oxlglfpdJRy/YpwYT6xdpzB2Po451go/3pWIrZikvmj5UZSk+/kjikzQPCf9lyzG5T2O91iZwOHexL+XJjdhT4wK/9glnL+3vpPlhGo8oVOtPa2Xki1DBqNSo9f0hcTzeEccaorm3UQNG51qHsxd5NBRq13Oz+Cq4uy/fF7IPXUfd/+1F3rzQ+qn4jsTPT9P8LI3nxHln5cx8H5tediL56XUPhfqZPNj0C+6idq3dl8Z2yMzVA+TarK1ro9/MpZ029xGbK3MT0/cNr60o5xHkNp1ZOT+oPX/dei2uvs5x71U75qN74EGm1+EbcpV4TYlzUcXyrL0rNj+HWD47i3nvSZvtA/Y/wTsU7ANivsprcHG6Mt9T8xv5pzW0iOPYrU1oOZfgm6+R821C3NuRI+orYN9S7jnIW/CcUO6vn4QfbLlxeWhrxfbZWYETpNTDPjfb336VU4Npe5TKYDDhnz+Vt33h/jtse/sh84IejZn2lamrsy+F99r/H9mW27X+Sgb7reCtJF4qsO8OFiX0oQ==
+   eJyFVs1OFEEQ7hrDrSfOBI2P4AOoTyAnXsB3MPEoiUfl5N70gGFfiINeOJEsbFg3JCTggD83lJWqVNV2dW33Ukmnd/qnvq9+e0MfAuAIZm5w/O7SXFun+VeX37XzLIbws+MzfiY5izzvNiF8j6sYet5jKqf3Df/2uklf1Q6RC4M9j2UbSvarvTXdytfqmnf5mSOxf6tNfM67xEfvvcP9G8PN+8Las+Qd2C/qi0bWQLCOY26/yoOWsX9EjhudexJZVykudPZzk2OV+F2hjl6wTwwmrV/imDoeBx3rJD7el4qtmKW8aPpQlbn4eA/EJzgPiP+25ZhsQK7X2kQczl3sS3nyT+ypcSG/9ojzCvc3cX6E4zGEav1prWS+CBWMSo1a3+8Dx+MjcKxJNPdWasDoXOpw9lIeDYXa9dwsvgrd3ZXvS9knXQfd/fZS3rxsJY8rvgPx8zOcn+N4AZx3Vs7M95HpZceSn173IOdf49ltHG9wjB6u+oXuUu1au68gx564eiC5MWvL2uhzXxKHzTb1EZsrUxPTTw2vLSDlEcktnlk4P2g/+OvWa3H1dU73dtqcj+4RDzC9jr5JrpHXGDgXVSzP2rti83OI5bOTmPaetsk+wv4vePuC/QWYr/IaXJyuzffY/Kb80xqaxTx2SxNaziXyzWnkfBsB93bKEfUVYd9C6jmUt8RzBKm/fhV+ZIv2GbXL1orts5MCJ5JSD/vWrH/7VU4Mpu1RKoPBJP/8qbztM/ffYd3bTzIt6NGYaV8Zuzo7LLzX/v/Iutyu9Vcw2B8EbyHxUiH77gCPZPbr
  </data>
 </layer>
- <layer name="Above" width="30" height="20" visible="0">
+ <layer name="Above" width="30" height="20">
  <data encoding="base64" compression="zlib">
   eJxjYBi64IMAaeovCUD0fITqO06ifmJAOg3MJMbONKi9wryY8h9p5KY0Ms29hEUfNcMN2b/I8Y0NhNMgbJDT5UcB7G4QYqSuHfgANeKfXDNA+hSBflUCYmUgVgFiVTL8Top/kdUZURjO2MxEB9jKEVqkK+S0hEzjshcmR2o5SQ4Ip9AucvM/peEcTiBd4XIXrrKPUHmDSz96XGIrN3CZTUqYYzPjApT/iYRyhB5pCpfdxIgjgwsUupWS8hMAdow8/w==
  </data>
 </layer>
 <layer name="Walkable" width="30" height="20" visible="0">
  <data encoding="base64" compression="zlib">
-   eJzlkksKwCAQQz1CL+X9r+SqIELG53wQ2oAbW30mk/601i+sWX/gzvybWSt9iW1xqj2vd1f4VQzvDEgvFYOeo/JkmtVH4pfOlHp6v5+8yfJMMln/IX5Ocs3uEGHv9lSeEaYl1dPMnNU9RBmerVlEWZ5eV60IewBTBI/G
+   eJzlklEKgDAMQ3cEL7X7X8kvYQipz6ZloIH9TLe3pJnHGHPDWvUH7srfmbXSl9gRp9vz/e4Ov4qRnQHppWLQc1SZTKv6SPzSmVJP13f3Tc4/xM+bXKs7RNhPeypPhxlJ9bQyZ3UPUYXnaBYuK9PrruWwT4sfkBs=
  </data>
 </layer>
 <objectgroup name="Mapevents" width="30" height="20">
@@ -175,58 +175,44 @@
   </properties>
  </object>
 </objectgroup>
- <objectgroup name="Spawn" width="30" height="20" visible="0">
-  <object name="forestwesral5" type="spawn" x="384" y="352" width="96" height="96">
+ <objectgroup name="Spawn" width="30" height="20">
+  <object name="forestfly2" type="spawn" x="384" y="352" width="96" height="96"/>
+  <object name="forestfly1" type="spawn" x="416" y="448" width="32" height="32"/>
+  <object name="forestfly1" type="spawn" x="384" y="480" width="256" height="96">
   <properties>
-    <property name="respawn" value="false"/>
+    <property name="quantity" value="4"/>
   </properties>
  </object>
-  <object name="forestregral2" type="spawn" x="416" y="448" width="32" height="32"/>
-  <object name="forestregral3" type="spawn" x="384" y="480" width="160" height="128">
+  <object name="khakin2" type="spawn" x="768" y="224" width="128" height="192"/>
+  <object name="khakin2" type="spawn" x="832" y="224" width="96" height="96"/>
+  <object name="khakin1" type="spawn" x="864" y="416" width="32" height="64"/>
+  <object name="khakin1" type="spawn" x="672" y="480" width="224" height="96">
+   <properties>
+    <property name="quantity" value="2"/>
+   </properties>
+  </object>
+  <object name="khakin2" type="spawn" x="672" y="416" width="64" height="32">
+   <properties>
+    <property name="quantity" value="2"/>
+   </properties>
+  </object>
+  <object name="khakin1" type="spawn" x="480" y="256" width="256" height="160">
   <properties>
    <property name="quantity" value="3"/>
   </properties>
  </object>
-  <object name="forestwesral4" type="spawn" x="544" y="448" width="96" height="96"/>
-  <object name="slargrum_10" type="spawn" x="768" y="320" width="160" height="96"/>
-  <object name="xalirg_4" type="spawn" x="832" y="224" width="96" height="96"/>
-  <object name="slargrum_9" type="spawn" x="864" y="416" width="32" height="96"/>
-  <object name="zortak_4" type="spawn" x="672" y="448" width="192" height="128">
+  <object name="khakin2" type="spawn" x="384" y="256" width="96" height="64"/>
+  <object name="khakin3" type="spawn" x="352" y="256" width="32" height="64">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
  </object>
-  <object name="slargrum_9" type="spawn" x="672" y="416" width="64" height="32">
+  <object name="khakin3" type="spawn" x="32" y="128" width="320" height="192">
   <properties>
-    <property name="quantity" value="2"/>
-   </properties>
-  </object>
-  <object name="xalirg_5" type="spawn" x="480" y="256" width="256" height="160">
-   <properties>
-    <property name="quantity" value="3"/>
-   </properties>
-  </object>
-  <object name="slargrum_10" type="spawn" x="384" y="256" width="96" height="64"/>
-  <object name="xalirg_4" type="spawn" x="352" y="256" width="32" height="64">
-   <properties>
-    <property name="quantity" value="2"/>
-   </properties>
-  </object>
-  <object name="slargrum_9" type="spawn" x="32" y="128" width="320" height="192">
-   <properties>
-    <property name="quantity" value="2"/>
-   </properties>
-  </object>
-  <object name="zortak_4" type="spawn" x="0" y="128" width="352" height="192">
-   <properties>
-    <property name="quantity" value="3"/>
-   </properties>
-  </object>
-  <object name="zortak_5" type="spawn" x="192" y="352" width="32" height="32">
-   <properties>
-    <property name="respawn" value="false"/>
+    <property name="quantity" value="4"/>
   </properties>
  </object>
+  <object name="khakin3" type="spawn" x="160" y="352" width="32" height="32"/>
 </objectgroup>
 <objectgroup name="Keys" width="30" height="20"/>
 </map>
--- a/AndorsTrail/res/xml/lodar4.tmx
+++ b/AndorsTrail/res/xml/lodar4.tmx
@@ -138,7 +138,7 @@
   eJzNlMsNgCAQRLUAEmzexIsl2IV6txLtQIkhEoL7E1bmgodhH4vDNo1Mh32+d/vuC+V8B9G7Ij4q06vteH6qqP1Ia29AfQrbeTj3XkIl2Fg+UuxUZkreD7UmdAbo/4cajIwN+UfzrNz3xvHH7Oni9eZepTUomq89S7TP9/zl/BJxepWwqb44R7XpzznmBM0dzTnrWWFOc7x5jJmrFuZP9ZeLrSXuzKyZCWVbs09OLnIytYUxTzuhREg=
  </data>
 </layer>
- <layer name="Walkable" width="30" height="25" visible="0">
+ <layer name="Walkable" width="30" height="25">
  <data encoding="base64" compression="zlib">
   eJzNk1EOwCAIQz3CLuX9r7QvE2MKlKJuJMs+Bn2tsv601sVnlDr/BVedteYivfFtriyTYSMOKiWzx157UD/LRzqeFpOH6c/UfNa7ds3jZLJW9rzC2sm+xbR2ruJfYaP3idzofq07Z30obMTN5Lc8r/NeNuQju6dMeXvGci3/XjbEsriMDuPX688yWGZ0JhkN9f+Ldk/VUz2cYlbv6AT/JvNv+V6NTqqr
  </data>
@@ -176,92 +176,55 @@
  </object>
  <object name="sign_lodar4" type="sign" x="768" y="384" width="96" height="64"/>
 </objectgroup>
- <objectgroup name="Spawn" width="30" height="25" visible="0">
-  <object name="forestregral1" type="spawn" x="64" y="96" width="64" height="96"/>
-  <object name="forestwesral2" type="spawn" x="128" y="160" width="128" height="96">
+ <objectgroup name="Spawn" width="30" height="25">
+  <object name="forestfly1" type="spawn" x="64" y="96" width="64" height="96"/>
+  <object name="hanklbit1" type="spawn" x="128" y="160" width="160" height="192">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
  </object>
-  <object name="forestregral1" type="spawn" x="192" y="256" width="96" height="64"/>
-  <object name="forestfly3" type="spawn" x="224" y="352" width="64" height="32">
+  <object name="forestfly2" type="spawn" x="224" y="352" width="64" height="32">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
  </object>
-  <object name="forestwesral3" type="spawn" x="224" y="416" width="256" height="224">
+  <object name="forestfly1" type="spawn" x="64" y="416" width="384" height="224">
   <properties>
    <property name="quantity" value="5"/>
   </properties>
  </object>
-  <object name="forestregral1" type="spawn" x="64" y="544" width="160" height="64">
+  <object name="forestfly1" type="spawn" x="480" y="384" width="224" height="160">
+   <properties>
+    <property name="quantity" value="4"/>
+   </properties>
+  </object>
+  <object name="forestfly1" type="spawn" x="640" y="544" width="192" height="96">
   <properties>
    <property name="quantity" value="3"/>
   </properties>
  </object>
-  <object name="forestregral1" type="spawn" x="288" y="384" width="192" height="256">
+  <object name="forestfly1" type="spawn" x="416" y="96" width="192" height="192">
   <properties>
-    <property name="quantity" value="2"/>
+    <property name="quantity" value="5"/>
   </properties>
  </object>
-  <object name="forestwesral3" type="spawn" x="480" y="448" width="96" height="96">
-   <properties>
-    <property name="quantity" value="2"/>
-   </properties>
-  </object>
-  <object name="forestwesral3" type="spawn" x="640" y="544" width="192" height="96">
-   <properties>
-    <property name="quantity" value="3"/>
-   </properties>
-  </object>
-  <object name="forestregral1" type="spawn" x="576" y="384" width="160" height="160">
-   <properties>
-    <property name="quantity" value="3"/>
-   </properties>
-  </object>
-  <object name="forestwesral3" type="spawn" x="576" y="352" width="160" height="192">
-   <properties>
-    <property name="quantity" value="2"/>
-   </properties>
-  </object>
-  <object name="forestregral2" type="spawn" x="448" y="64" width="64" height="32">
-   <properties>
-    <property name="quantity" value="2"/>
-   </properties>
-  </object>
-  <object name="forestregral1" type="spawn" x="416" y="96" width="192" height="192">
-   <properties>
-    <property name="quantity" value="2"/>
-   </properties>
-  </object>
-  <object name="forestwesral4" type="spawn" x="384" y="96" width="256" height="224">
-   <properties>
-    <property name="quantity" value="3"/>
-   </properties>
-  </object>
-  <object name="forestwesral3" type="spawn" x="640" y="64" width="192" height="288">
+  <object name="forestfly1" type="spawn" x="608" y="96" width="288" height="224">
   <properties>
    <property name="quantity" value="6"/>
   </properties>
  </object>
-  <object name="forestregral2" type="spawn" x="832" y="64" width="64" height="96"/>
-  <object name="forestregral2" type="spawn" x="768" y="448" width="64" height="96"/>
-  <object name="forestwesral4" type="spawn" x="832" y="416" width="32" height="32"/>
-  <object name="forestregral1" type="spawn" x="864" y="416" width="64" height="288">
-   <properties>
-    <property name="quantity" value="3"/>
-   </properties>
-  </object>
-  <object name="forestwesral3" type="spawn" x="640" y="672" width="224" height="96">
+  <object name="forestfly2" type="spawn" x="768" y="480" width="64" height="32"/>
+  <object name="yjacket1" type="spawn" x="864" y="480" width="32" height="192">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
  </object>
-  <object name="forestfly3" type="spawn" x="608" y="640" width="256" height="128">
+  <object name="yjacket1" type="spawn" x="640" y="672" width="256" height="64">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
  </object>
+  <object name="brtender1" type="spawn" x="256" y="448" width="224" height="192"/>
 </objectgroup>
 <objectgroup name="Keys" width="30" height="25" visible="0"/>
 </map>
--- a/AndorsTrail/res/xml/lodar5.tmx
+++ b/AndorsTrail/res/xml/lodar5.tmx
@@ -1,128 +1,127 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="30" height="15" tilewidth="32" tileheight="32">
 <properties>
  <property name="outside" value="1"/>
 </properties>
 <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="576" height="192"/>
 </tileset>
 <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="576" height="192"/>
 </tileset>
 <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="576" height="192"/>
 </tileset>
 <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="480" height="256"/>
 </tileset>
 <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="480" height="256"/>
 </tileset>
 <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="512" height="256"/>
 </tileset>
 <layer name="Ground" width="30" height="15">
  <data encoding="base64" compression="zlib">
@@ -159,36 +158,29 @@
  </object>
 </objectgroup>
 <objectgroup name="Spawn" width="30" height="15">
-  <object name="forestwesral1" type="spawn" x="64" y="128" width="64" height="64"/>
-  <object name="forestregral1" type="spawn" x="64" y="224" width="160" height="128">
-   <properties>
-    <property name="quantity" value="2"/>
-   </properties>
-  </object>
-  <object name="forestfly2" type="spawn" x="224" y="192" width="128" height="32"/>
-  <object name="forestwesral1" type="spawn" x="384" y="256" width="96" height="160">
+  <object name="forestfly1" type="spawn" x="64" y="128" width="192" height="224">
   <properties>
    <property name="quantity" value="3"/>
   </properties>
  </object>
-  <object name="forestregral1" type="spawn" x="320" y="160" width="128" height="128">
+  <object name="hanklbit1" type="spawn" x="256" y="192" width="64" height="32">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
  </object>
-  <object name="forestwesral2" type="spawn" x="480" y="128" width="128" height="96">
+  <object name="forestfly1" type="spawn" x="320" y="128" width="320" height="288">
+   <properties>
+    <property name="quantity" value="5"/>
+   </properties>
+  </object>
+  <object name="forestfly1" type="spawn" x="672" y="192" width="32" height="64">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
  </object>
-  <object name="forestregral1" type="spawn" x="672" y="192" width="32" height="64">
+  <object name="caveburr1" type="spawn" x="672" y="288" width="192" height="128">
   <properties>
-    <property name="quantity" value="2"/>
-   </properties>
-  </object>
-  <object name="forestwesral1" type="spawn" x="672" y="256" width="192" height="64">
-   <properties>
-    <property name="quantity" value="2"/>
+    <property name="quantity" value="3"/>
   </properties>
  </object>
 </objectgroup>
--- a/AndorsTrail/res/xml/lodar5cave0.tmx
+++ b/AndorsTrail/res/xml/lodar5cave0.tmx
@@ -1,125 +1,124 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="30" height="29" tilewidth="32" tileheight="32">
 <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="576" height="192"/>
 </tileset>
 <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="576" height="192"/>
 </tileset>
 <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="576" height="192"/>
 </tileset>
 <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="480" height="256"/>
 </tileset>
 <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="480" height="256"/>
 </tileset>
 <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="512" height="256"/>
 </tileset>
 <layer name="Ground" width="30" height="29">
  <data encoding="base64" compression="zlib">
@@ -156,67 +155,82 @@
  </object>
 </objectgroup>
 <objectgroup name="Spawn" width="30" height="29">
-  <object name="caveslir1" type="spawn" x="32" y="160" width="224" height="192">
+  <object name="cavebat1" type="spawn" x="32" y="160" width="224" height="192">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
  </object>
-  <object name="caveslir1" type="spawn" x="320" y="128" width="32" height="64"/>
-  <object name="cavenarg1" type="spawn" x="384" y="96" width="256" height="160">
+  <object name="caveburr1" type="spawn" x="320" y="128" width="32" height="64">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
  </object>
-  <object name="caveslir1" type="spawn" x="576" y="384" width="64" height="32">
+  <object name="cavebat1" type="spawn" x="384" y="96" width="256" height="160">
+   <properties>
+    <property name="quantity" value="2"/>
+   </properties>
+  </object>
+  <object name="caveburr1" type="spawn" x="576" y="384" width="64" height="32">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
  </object>
  <object name="caveslir1" type="spawn" x="480" y="480" width="32" height="32"/>
  <object name="cavenarg1" type="spawn" x="352" y="480" width="32" height="32"/>
-  <object name="caveslir1" type="spawn" x="224" y="512" width="128" height="128"/>
-  <object name="cavenarg1" type="spawn" x="128" y="576" width="32" height="64"/>
-  <object name="cavenarg1" type="spawn" x="32" y="544" width="96" height="128"/>
-  <object name="caveslir1" type="spawn" x="64" y="704" width="32" height="32"/>
-  <object name="cavenarg1" type="spawn" x="192" y="768" width="32" height="64">
+  <object name="caveburr1" type="spawn" x="224" y="512" width="128" height="128"/>
+  <object name="caveburr1" type="spawn" x="128" y="576" width="32" height="64">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
  </object>
-  <object name="caveslir1" type="spawn" x="256" y="768" width="160" height="96">
+  <object name="caveburr2" type="spawn" x="32" y="544" width="96" height="128"/>
+  <object name="caveburr1" type="spawn" x="64" y="704" width="32" height="32"/>
+  <object name="caveburr1" type="spawn" x="192" y="768" width="32" height="64">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
  </object>
-  <object name="caveslir1" type="spawn" x="512" y="640" width="96" height="192"/>
-  <object name="cavenarg1" type="spawn" x="480" y="640" width="128" height="192"/>
-  <object name="caveslir1" type="spawn" x="672" y="608" width="32" height="32"/>
-  <object name="cavenarg1" type="spawn" x="704" y="512" width="128" height="192">
+  <object name="cavebat1" type="spawn" x="256" y="768" width="160" height="96">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
  </object>
-  <object name="caveslir1" type="spawn" x="704" y="320" width="64" height="32">
+  <object name="caveburr1" type="spawn" x="480" y="640" width="128" height="192"/>
+  <object name="caveburr1" type="spawn" x="672" y="608" width="32" height="32"/>
+  <object name="cavebat1" type="spawn" x="704" y="512" width="128" height="192">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
  </object>
-  <object name="cavenarg1" type="spawn" x="704" y="96" width="32" height="224"/>
-  <object name="caveslir1" type="spawn" x="736" y="352" width="32" height="160"/>
-  <object name="cavenarg1" type="spawn" x="736" y="96" width="160" height="32"/>
-  <object name="caveslir1" type="spawn" x="896" y="160" width="32" height="192"/>
-  <object name="cavenarg1" type="spawn" x="864" y="352" width="64" height="32">
+  <object name="caveburr1" type="spawn" x="704" y="96" width="32" height="224">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
  </object>
-  <object name="cavenarg1" type="spawn" x="896" y="384" width="32" height="320"/>
-  <object name="caveslir1" type="spawn" x="864" y="384" width="64" height="320"/>
-  <object name="cavenarg1" type="spawn" x="640" y="736" width="288" height="128">
+  <object name="caveburr1" type="spawn" x="736" y="352" width="32" height="160">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
  </object>
+  <object name="caveburr1" type="spawn" x="736" y="96" width="160" height="32">
+   <properties>
+    <property name="quantity" value="2"/>
+   </properties>
+  </object>
+  <object name="caveburr1" type="spawn" x="896" y="160" width="32" height="192"/>
+  <object name="cavebat1" type="spawn" x="864" y="352" width="64" height="32">
+   <properties>
+    <property name="quantity" value="2"/>
+   </properties>
+  </object>
+  <object name="caveburr1" type="spawn" x="896" y="384" width="32" height="320"/>
+  <object name="cavebat1" type="spawn" x="640" y="736" width="288" height="128">
+   <properties>
+    <property name="quantity" value="2"/>
+   </properties>
+  </object>
+  <object name="cavebat1" type="spawn" x="576" y="288" width="32" height="64"/>
+  <object name="caveburr1" type="spawn" x="416" y="480" width="32" height="32"/>
 </objectgroup>
 <objectgroup name="Keys" width="30" height="29"/>
 </map>
--- a/AndorsTrail/res/xml/lodar5cave1.tmx
+++ b/AndorsTrail/res/xml/lodar5cave1.tmx
@@ -1,125 +1,124 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="20" height="30" tilewidth="32" tileheight="32">
 <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="576" height="192"/>
 </tileset>
 <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="576" height="192"/>
 </tileset>
 <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="576" height="192"/>
 </tileset>
 <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="480" height="256"/>
 </tileset>
 <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="480" height="256"/>
 </tileset>
 <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="512" height="256"/>
 </tileset>
 <layer name="Ground" width="20" height="30">
  <data encoding="base64" compression="zlib">
@@ -155,31 +154,20 @@
   </properties>
  </object>
 </objectgroup>
- <objectgroup name="Spawn" width="20" height="30" visible="0">
-  <object name="caveslir2" type="spawn" x="128" y="64" width="448" height="512">
+ <objectgroup name="Spawn" width="20" height="30">
+  <object name="caveburr1" type="spawn" x="128" y="64" width="448" height="736">
   <properties>
-    <property name="quantity" value="3"/>
+    <property name="quantity" value="8"/>
   </properties>
  </object>
-  <object name="cavenarg2" type="spawn" x="96" y="64" width="480" height="512">
+  <object name="cavebat1" type="spawn" x="96" y="96" width="512" height="736">
   <properties>
-    <property name="quantity" value="2"/>
+    <property name="quantity" value="7"/>
   </properties>
  </object>
-  <object name="cavenarg1" type="spawn" x="64" y="64" width="512" height="512">
-   <properties>
-    <property name="quantity" value="2"/>
-   </properties>
-  </object>
-  <object name="cavenarg2" type="spawn" x="416" y="640" width="32" height="32"/>
-  <object name="caveslir2" type="spawn" x="256" y="672" width="224" height="160">
-   <properties>
-    <property name="quantity" value="2"/>
-   </properties>
-  </object>
-  <object name="cavenarg2" type="spawn" x="160" y="672" width="320" height="128"/>
-  <object name="caveslir2" type="spawn" x="224" y="832" width="32" height="32"/>
-  <object name="cavenarg2" type="spawn" x="128" y="832" width="32" height="64">
+  <object name="cavebat2" type="spawn" x="416" y="640" width="32" height="32"/>
+  <object name="caveburr2" type="spawn" x="224" y="832" width="32" height="32"/>
+  <object name="caveburr1" type="spawn" x="128" y="832" width="32" height="64">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
--- a/AndorsTrail/res/xml/lodar5cave2.tmx
+++ b/AndorsTrail/res/xml/lodar5cave2.tmx
@@ -1,125 +1,124 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="20" height="20" tilewidth="32" tileheight="32">
 <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="576" height="192"/>
 </tileset>
 <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="576" height="192"/>
 </tileset>
 <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="576" height="192"/>
 </tileset>
 <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="480" height="256"/>
 </tileset>
 <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="480" height="256"/>
 </tileset>
 <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="512" height="256"/>
 </tileset>
 <layer name="Ground" width="20" height="20">
  <data encoding="base64" compression="zlib">
@@ -136,7 +135,7 @@
   eJxjYKAPSBegrhlpJJiHzW6QGClmIJuDTV84Gf7Dp4cc8/D5hxzz8AFqmkdOXOAD9PDrVF7qmkcJoLZ54kwIdhYP6fqnY9FDjfyPDGgZhqJMqGFADsCmn1IzByMAAAwXDDM=
  </data>
 </layer>
- <layer name="Walkable" width="20" height="20" visible="0">
+ <layer name="Walkable" width="20" height="20">
  <data encoding="base64" compression="zlib">
   eJxzFWBgcB3FYACjYWxCarGJ4wOkmIfPDGLF8ZlHqtsJ6aE0PAiZhctsQuFHrbRBqvtIcTs1zaS2O4mNG1LtRDeTWumBGEBJmFIavtjClFyzcJlNTwwAC59f9g==
  </data>
@@ -149,39 +148,45 @@
   </properties>
  </object>
 </objectgroup>
- <objectgroup name="Spawn" width="20" height="20" visible="0">
-  <object name="cavenarg2" type="spawn" x="480" y="160" width="128" height="128">
+ <objectgroup name="Spawn" width="20" height="20">
+  <object name="caveat2" type="spawn" x="480" y="160" width="128" height="128">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
  </object>
-  <object name="caveslir2" type="spawn" x="288" y="96" width="256" height="192">
+  <object name="caveburr2" type="spawn" x="288" y="96" width="256" height="192">
   <properties>
    <property name="quantity" value="3"/>
   </properties>
  </object>
-  <object name="caveslir2" type="spawn" x="224" y="128" width="32" height="64">
+  <object name="caveburr2" type="spawn" x="224" y="128" width="32" height="64">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
  </object>
-  <object name="cavenarg3" type="spawn" x="32" y="96" width="160" height="352"/>
-  <object name="cavenarg2" type="spawn" x="0" y="96" width="192" height="352">
+  <object name="caveburr2" type="spawn" x="0" y="128" width="192" height="320">
   <properties>
    <property name="quantity" value="3"/>
   </properties>
  </object>
-  <object name="caveslir2" type="spawn" x="32" y="320" width="288" height="288">
+  <object name="caveburr1" type="spawn" x="32" y="320" width="288" height="288">
   <properties>
    <property name="quantity" value="3"/>
   </properties>
  </object>
-  <object name="cavenarg3" type="spawn" x="288" y="384" width="256" height="224">
+  <object name="cavebat2" type="spawn" x="320" y="384" width="224" height="224">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
  </object>
-  <object name="cavenarg2" type="spawn" x="288" y="352" width="256" height="256"/>
+  <object name="caveburr2" type="spawn" x="288" y="352" width="256" height="256"/>
+ </objectgroup>
+ <objectgroup name="Spawn_bats" width="20" height="20" visible="0">
+  <object name="cavebat1" type="spawn" x="32" y="96" width="480" height="512">
+   <properties>
+    <property name="quantity" value="7"/>
+   </properties>
+  </object>
 </objectgroup>
 <objectgroup name="Keys" width="20" height="20"/>
 </map>
--- a/AndorsTrail/res/xml/lodar6.tmx
+++ b/AndorsTrail/res/xml/lodar6.tmx
@@ -128,17 +128,17 @@
   eJw7ysbAcHQUj+JRDMdTmMjX28QEwVOYyDdnKVDfMjRMjjnbgfp2oGFy/XWKCRUPdByN4lE8ioceBgBjqaoV
  </data>
 </layer>
- <layer name="Objects" width="18" height="30" visible="0">
+ <layer name="Objects" width="18" height="30">
  <data encoding="base64" compression="zlib">
   eJyVVEtOAzEMTWadkTLiBHAVeiWQWLJlx5ZTITZIfESBSpWmtHyWlAJ5JO5kUtszWKoyTexn+/lTNcZ8eGOqgdOG0zTy+1iMvdpEEbBKf5zfP/OAs3Dxm4uPdN99h/Pmd+NZZxikn+vlfss3wrh3ek5D/ABjGTCOQk63Sk5VI/OC/8QHiRY37ibB38z130hWBS/SqfFSxqH1lfSG+rRO55b66rTidSAvjo+nx6eJGJdCvaBzJ/ACDmA799EetZgKNdwKk1POG+why+Tzyu/W/IaJB/cP6f7CBnsbv19trNOTT++NXieS8yqem2B/Fn4/trNFnpvkC/2k1Ykw94PeQR1rhnieXddzc6/zw/Jodu+mCXOR5kqamdJH/vbpeOwtftb/Zbxkc+15bsuZHbN/pHNop/5nPyPnE4EvbT/nuiRtyg2zt3Z9vTxf1HyV9lCZP/XDpO5wsSNpPw3tZ25Pl/Ucs58pdszbl7KPtP1ssxyO677/Uh+5YP4fs/0MnVbJQeqf8g7yPbBTx/QP4jms5f7mzl/wU/g0
  </data>
 </layer>
- <layer name="Above" width="18" height="30" visible="0">
+ <layer name="Above" width="18" height="30">
  <data encoding="base64" compression="zlib">
   eJxjYCANfBAgUQMFAGTXRyz2IYtRwz309BMxYCD9NBzDdrD5CVuapgSQ6h5s9mMzA6QOVx4kFxDKz6Sahe4+9Lgm1+zjAggz8NlHrBvxgcGWnigFtEov6GFPTrhhi09qgwt4zBwMfhjI8gcAoew20Q==
  </data>
 </layer>
- <layer name="Walkable" width="18" height="30" visible="0">
+ <layer name="Walkable" width="18" height="30">
  <data encoding="base64" compression="zlib">
   eJxzFWBgcKUzBgFK9SMDapg10Gag+2ugwmU4hu1w9NNgcQ+1whZZPzXdQw2zKPUrPrXUSguDMT1RO21Qaiau+KRX+AwHP1BqFgAh1ZPC
  </data>
@@ -157,60 +157,48 @@
   </properties>
  </object>
 </objectgroup>
- <objectgroup name="Spawn" width="18" height="30" visible="0">
-  <object name="undeadcr1" type="spawn" x="416" y="704" width="128" height="96">
+ <objectgroup name="Spawn" width="18" height="30">
+  <object name="erumen_f1" type="spawn" x="448" y="704" width="32" height="64">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
  </object>
-  <object name="slargrum_3" type="spawn" x="320" y="608" width="64" height="32">
+  <object name="erumen_f1" type="spawn" x="320" y="640" width="32" height="32">
   <properties>
-    <property name="quantity" value="2"/>
+    <property name="quantity" value="1"/>
   </properties>
  </object>
-  <object name="slargrum_4" type="spawn" x="288" y="640" width="128" height="160">
+  <object name="erumen_f2" type="spawn" x="288" y="64" width="128" height="64">
+   <properties>
+    <property name="quantity" value="1"/>
+   </properties>
+  </object>
+  <object name="erumen_f1" type="spawn" x="192" y="128" width="192" height="160">
   <properties>
    <property name="quantity" value="3"/>
   </properties>
  </object>
-  <object name="forestregral3" type="spawn" x="224" y="576" width="128" height="32"/>
-  <object name="urdom_3" type="spawn" x="288" y="32" width="128" height="96">
-   <properties>
-    <property name="respawn" value="false"/>
-   </properties>
-  </object>
-  <object name="undeadcr1" type="spawn" x="64" y="480" width="160" height="160">
-   <properties>
-    <property name="quantity" value="3"/>
-   </properties>
-  </object>
-  <object name="werewolf_2" type="spawn" x="192" y="416" width="64" height="32">
+  <object name="erumen_f1" type="spawn" x="160" y="288" width="128" height="160">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
  </object>
-  <object name="undeadcr1" type="spawn" x="192" y="352" width="64" height="32">
+  <object name="erumen_f1" type="spawn" x="64" y="448" width="128" height="192">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
  </object>
-  <object name="slargrum_4" type="spawn" x="192" y="288" width="64" height="32">
+  <object name="erumen_f1" type="spawn" x="256" y="576" width="32" height="32">
+   <properties>
+    <property name="quantity" value="1"/>
+   </properties>
+  </object>
+  <object name="erumen_f1" type="spawn" x="256" y="832" width="64" height="32">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
  </object>
-  <object name="undeadcr1" type="spawn" x="192" y="160" width="192" height="96">
-   <properties>
-    <property name="quantity" value="2"/>
-   </properties>
-  </object>
-  <object name="slargrum_4" type="spawn" x="288" y="128" width="64" height="32">
-   <properties>
-    <property name="quantity" value="2"/>
-   </properties>
-  </object>
-  <object name="undeadcr1" type="spawn" x="288" y="800" width="128" height="96"/>
-  <object name="slargrum_4" type="spawn" x="192" y="864" width="64" height="32">
+  <object name="erumen_f1" type="spawn" x="320" y="672" width="128" height="224">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
--- a/AndorsTrail/res/xml/lodar7.tmx
+++ b/AndorsTrail/res/xml/lodar7.tmx
@@ -128,17 +128,17 @@
   eJzVls0NgzAMhVEO7axdoyvQjEA7QugAXJiqRMJSGtnPxiQHDhZCMfni5x+y3IZhubA9w79pfi2Y47bPi7H6LOVaTy6yK3MtHGv+rTV0NE5rvKg2rPFpXC/Dc5ZWjHIfbr+pw7kt36TNHvdjtd9Km5L7rp499OG48/4+C4zkYCN9iLvu3BUwUtDzgnIQGW7un8ylXpIYiKvpERlf67ydQA1ouYiV73iAm4JcAxr7w2jHcaXvqQakuIhd9khmfhntOK5WR2iNdKEeqZnkI/0PUL602i57RPKRuChmy6zLXLTuuUd47helaf99Sesz88sSr6S1ZX5p2njvbNaYvVzPnGjBRftb2F7uWba0Zr27olrynOsHAINEtQ==
  </data>
 </layer>
- <layer name="Objects" width="30" height="30" visible="0">
+ <layer name="Objects" width="30" height="30">
  <data encoding="base64" compression="zlib">
   eJyNV7FuE0EQvXM6tCfOcpEaGj4k+Rh+IAUoEEEqLFGYAhTED/AltDRgyWDFQCQkOzEJqYjjwL7cPO/zeG0x0mV9u3vzZmbfzGxa7eJWxiH+ib9b8fld//9YxnEevz2z7/Guo+7jfKdKOiDzkN+7Cfsijs9aRTEMjY5vNh7GuUuxpV01+87r5hvVsRvXvgg21rHP27tiW5RJ/G5kmLM47lTN79dlM7aqZV3efn7n/YQN0P3T2QKsr4bn5c+dZNOtiD85+89sXy6mxFRbINOMrZDu3aJ4HN/33eN1LSRzrj7WGHFmE/HX7wfmQd2c9XV87sV436/yuk8lLopxHBoclUfkhMOkjwc+JlEGYdWP85D0AQNcu3LnR658r/N+0scFV4rVWJOP9ONHSPaPbeR5n1isdG07rOoEJtbLquEd7SDHkXMf4/uevatfjHVpa6M1du+Lb7D3yjhPwVxX3hnzY5mbCi7y/HqDL4zBqfMfOTUx/BPRdxTP5m2ZODyql+1QXjM+Wy4ebRcD1iq1WwXrPeMK8wS1knH3eazxgYBP8zW6KblzeGIxeif+aqyIDczDMvmj8Ri5uGjO8Bw6VarDkKeGfS21pRv1v4jPmzJhjAWvJ/m6W+UxgcX6CdmReBL7pY1tW+vXzZl7jGFIPnKePUNrK8/C17yh6y8a1w914vyV4RBjJj7vOF5pbV1Ipkepndo7+s5GrGGOfIWAo4z7tFzVD7sXcWonXcz7M8Ebm1+oTd5G8oY1i99j/w05YD7AJvY6xaYu5QlzbEs4wj46d7WmL785D/3sKdR943jwSzgKeeV6CYRxmYh/yi+cM3nsc5f1Vesuvv1bNn3ledlgblUpDgPbQ3+ndk8Zh8SfoyrFin0Kuh8Kfkf8VkFuso6xl0yk7gKT89DxQM7zvf3295i+9VT6fyp3q0lY7i+5+k4ZuH6n3PCi/FTee0FNZU1h7dKx5bg3k3h6u1buQsXyvF/vujuUjrqXXGcOIdZ65+E3t7zbcP/y97TcHThnJ+XS9VZf93J3Xb3jInZ4/xSfz3XjT8e4ve7/Ai8z9nHb52tULtZ6t82d7wXrdEZHz+V8W3JxE/YSLzPr6+7k67D3JF+3Qx4bmMPgctph/wOg73OZ
  </data>
 </layer>
- <layer name="Above" width="30" height="30" visible="0">
+ <layer name="Above" width="30" height="30">
  <data encoding="base64" compression="zlib">
   eJztl8kNwkAMRU0qyFRHB6EORG2QO5WQDiACo2HkPWPlwr+AovCfl7ETAACWEXbTn+3XY3z/Hj+jHltFsgvAoRjvNYqL9TzEPSndK07LxJx6M2tRzEzeV9izwjMz4vB6UudAm4GMuOs4kB3h9Jhjq/cPo+m3pJMjLnJmhDN1Ia7NH4+jkavNDFdXLq8p2AeKQ11r82p7Pyt8bi9p4urZ89xZ8pWk5W7V2ttoH6O8VRMzy1nvGZ7aWmStv7e2GfsNhbPu8efikfaxtN8t7PaZUbMifpF7Lbui9ru+vt8E/6xnlzd/KQbNa2vsQ9nvf4R193v0BGTSWdc=
  </data>
 </layer>
- <layer name="Walkable" width="30" height="30" visible="0">
+ <layer name="Walkable" width="30" height="30">
  <data encoding="base64" compression="zlib">
   eJztlMsNgEAIRC3Bpuy/Ja+GwPAYd+NFEg8uOm/46HUex/Vf4yvGV9wsdnGJl131Ej+7mavn/3zXYRJu1J9oUI4btK/q3mEQjWzHMt1JLdRvxXVmWzHInNWzq74DwlX+CJPU0Z3Fmt/URhnxfNLjSm/nPFUdnUfCVXm33spLxc1yziyz8+ihyqkdpN4zVjcTEkqv0nRZla7TB8rp9lIxprvccVU/1Y5M/hsTtqOhdtfxO2W7XldoreaSvenyN1covO4=
  </data>
@@ -187,126 +187,80 @@
   </properties>
  </object>
 </objectgroup>
- <objectgroup name="Spawn" width="30" height="30" visible="0">
-  <object name="urdom_2" type="spawn" x="704" y="96" width="32" height="32"/>
-  <object name="slargrum_2" type="spawn" x="576" y="64" width="128" height="64">
+ <objectgroup name="Spawn" width="30" height="30">
+  <object name="yjacket1" type="spawn" x="704" y="96" width="32" height="32"/>
+  <object name="yjacket1" type="spawn" x="576" y="64" width="128" height="64">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
  </object>
-  <object name="forestregral2" type="spawn" x="576" y="160" width="64" height="32">
-   <properties>
-    <property name="quantity" value="2"/>
-   </properties>
-  </object>
-  <object name="werewolf_2" type="spawn" x="512" y="224" width="64" height="32">
-   <properties>
-    <property name="quantity" value="2"/>
-   </properties>
-  </object>
-  <object name="forestregral2" type="spawn" x="384" y="224" width="128" height="96">
-   <properties>
-    <property name="quantity" value="2"/>
-   </properties>
-  </object>
-  <object name="slargrum_2" type="spawn" x="256" y="256" width="128" height="96">
+  <object name="yjacket1" type="spawn" x="96" y="288" width="160" height="96">
   <properties>
    <property name="quantity" value="3"/>
   </properties>
  </object>
-  <object name="urdom_2" type="spawn" x="96" y="288" width="160" height="96">
+  <object name="yjacket1" type="spawn" x="32" y="320" width="64" height="96">
   <properties>
    <property name="quantity" value="3"/>
   </properties>
  </object>
-  <object name="werewolf_2" type="spawn" x="32" y="320" width="64" height="96"/>
-  <object name="slargrum_3" type="spawn" x="32" y="416" width="32" height="96"/>
-  <object name="forestregral2" type="spawn" x="32" y="512" width="128" height="160">
+  <object name="erumen_f1" type="spawn" x="32" y="512" width="128" height="160"/>
+  <object name="erumen_f1" type="spawn" x="32" y="672" width="224" height="224">
   <properties>
    <property name="quantity" value="3"/>
   </properties>
  </object>
-  <object name="slargrum_4" type="spawn" x="32" y="672" width="224" height="224">
-   <properties>
-    <property name="quantity" value="5"/>
-   </properties>
-  </object>
-  <object name="slargrum_3" type="spawn" x="224" y="384" width="32" height="32"/>
-  <object name="forestregral3" type="spawn" x="160" y="416" width="160" height="192">
+  <object name="hanklbit2" type="spawn" x="224" y="384" width="32" height="32"/>
+  <object name="yjacket1" type="spawn" x="160" y="480" width="160" height="128">
   <properties>
    <property name="quantity" value="3"/>
   </properties>
  </object>
-  <object name="werewolf_2" type="spawn" x="256" y="608" width="64" height="32">
+  <object name="hanklbit1" type="spawn" x="256" y="608" width="64" height="32">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
  </object>
-  <object name="slargrum_4" type="spawn" x="224" y="640" width="192" height="160">
+  <object name="yjacket2" type="spawn" x="224" y="640" width="192" height="160">
   <properties>
    <property name="quantity" value="3"/>
   </properties>
  </object>
-  <object name="forestregral3" type="spawn" x="320" y="608" width="96" height="192"/>
-  <object name="slargrum_4" type="spawn" x="288" y="800" width="32" height="32"/>
-  <object name="slargrum_4" type="spawn" x="320" y="864" width="64" height="32">
-   <properties>
-    <property name="quantity" value="2"/>
-   </properties>
-  </object>
-  <object name="zortak_1" type="spawn" x="736" y="832" width="32" height="32"/>
-  <object name="slargrum_5" type="spawn" x="448" y="576" width="256" height="224">
+  <object name="yjacket1" type="spawn" x="288" y="800" width="32" height="32"/>
+  <object name="hanklbit1" type="spawn" x="288" y="832" width="96" height="64"/>
+  <object name="yjacket2" type="spawn" x="512" y="160" width="128" height="96">
   <properties>
    <property name="quantity" value="3"/>
   </properties>
  </object>
-  <object name="undeadcr2" type="spawn" x="416" y="576" width="288" height="224"/>
-  <object name="undeadcr2" type="spawn" x="704" y="608" width="32" height="96"/>
-  <object name="slargrum_6" type="spawn" x="672" y="448" width="96" height="160"/>
-  <object name="slargrum_5" type="spawn" x="704" y="704" width="64" height="128">
-   <properties>
-    <property name="quantity" value="2"/>
-   </properties>
-  </object>
-  <object name="zortak_1" type="spawn" x="736" y="672" width="192" height="64">
-   <properties>
-    <property name="quantity" value="2"/>
-   </properties>
-  </object>
-  <object name="zortak_2" type="spawn" x="864" y="320" width="32" height="96"/>
-  <object name="slargrum_5" type="spawn" x="832" y="416" width="96" height="256">
+  <object name="yjacket2" type="spawn" x="288" y="224" width="224" height="128">
   <properties>
    <property name="quantity" value="3"/>
   </properties>
  </object>
-  <object name="undeadcr2" type="spawn" x="800" y="384" width="64" height="32">
+  <object name="yjacket2" type="spawn" x="704" y="800" width="64" height="96">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
  </object>
-  <object name="slargrum_5" type="spawn" x="672" y="256" width="160" height="128">
-   <properties>
-    <property name="quantity" value="3"/>
-   </properties>
-  </object>
-  <object name="zortak_2" type="spawn" x="800" y="192" width="128" height="64">
+  <object name="zortak1" type="spawn" x="448" y="576" width="224" height="224">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
  </object>
-  <object name="slargrum_5" type="spawn" x="448" y="320" width="224" height="96">
-   <properties>
-    <property name="quantity" value="3"/>
-   </properties>
-  </object>
-  <object name="zortak_1" type="spawn" x="416" y="320" width="256" height="96"/>
-  <object name="undeadcr2" type="spawn" x="288" y="384" width="160" height="96">
+  <object name="zortaks" type="spawn" x="672" y="768" width="96" height="32"/>
+  <object name="zortaks" type="spawn" x="672" y="448" width="96" height="160"/>
+  <object name="zortak1" type="spawn" x="704" y="608" width="32" height="64"/>
+  <object name="zortak1" type="spawn" x="768" y="672" width="128" height="64"/>
+  <object name="zortaks" type="spawn" x="288" y="352" width="384" height="160">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
  </object>
-  <object name="undeadcr1" type="spawn" x="352" y="480" width="64" height="64"/>
-  <object name="slargrum_1" type="spawn" x="832" y="96" width="64" height="64"/>
+  <object name="zortak1" type="spawn" x="672" y="256" width="160" height="128"/>
+  <object name="zortak1" type="spawn" x="864" y="320" width="32" height="64"/>
+  <object name="zortak1" type="spawn" x="832" y="416" width="64" height="192"/>
+  <object name="zortak1" type="spawn" x="800" y="192" width="96" height="64"/>
 </objectgroup>
 <objectgroup name="Keys" width="30" height="30" visible="0"/>
 </map>
--- a/AndorsTrail/res/xml/lodar8.tmx
+++ b/AndorsTrail/res/xml/lodar8.tmx
@@ -130,7 +130,7 @@
 </layer>
 <layer name="Objects" width="30" height="30">
  <data encoding="base64" compression="zlib">
-   eJyFVstOVEEQ7R7ixvSNdxKNa9249vUF8A8s4BvcaQJBJupKjAtdkGj8HzfuSXhECCSTDDMXcCfDDPZJV9nn1m1CJZ2+j+469ThV3e96zo2Dc+e1c3/i8H3n1uO8IeNtHK6fvt84R7mMOvpVer4Kt+/ZqdNaxhzEMQrp+6Zgb91L76ch6z6Q50XBg4zl2yRkHfuhvXdu/ITNK7XryKp82/bOPam6/9Xunvi+K/qbOB/GsRT37AWzQfyGferrWtWOofpsMXjWGCr2QtXOF+cMa/g7MDmODyWWy3XC1r0WE/NFnWPXo3yp70PSsSE+HMm/Q5nXCeN11f63aXy4yRbkCz6PQt6Lea3KOTil2Kudah90/r2b/p3IOi97lb8lWwbik3LP5re0/kr4dlF3cwthH06NvhlxuJHnKfnG/AOPj8x+5Qrn1sb2t+Uoxay0nvPQElPb8InrdEniihot2WJjrDHTXDDn8TyVGgcG8gA+2PipzCVml9Qf5sKX80LMmOvM+Udx/eOqGx/EZbHK9nFeVLQfKd8Ob+mPrIf7sfL4JLT5ZPvC/3eX66yRWGlPvDK+c21j1rrB92Nai1wqtu0LivnNS6x9fm981rHL2MbfrbprC/TCbuTuc+Gfyo+I8SmOmc8+zX3O5YhwtS60V1pboHdM9Vk68yBfeymWE+HZr15bz5deWgddH3zSN6M6GNZGv+ty+cznmComhPup9gjm8ALlXn1HjzumejgTvd/j/NG39V9T7BhzYHtagXcs6K9vqlR3EMTkWvAa8U31Y+b8Myb7xtjAHBo7uAb1rqE+AQ+80H5vMdWPlYJvzBv0z23NSyEGWmNbPuG+F9yx+Dsr9IGR3EnOjb96xil2Y2qI4w7+cH+6lLrfF1vHodzjB3XXHtXnfcZWTkPu+MT9PamV0nm3JOe15hF84P6KeSz3EfVL+1bft2MO7Pvx2wOqB+jmWOH+dhByz1uRHlbKsfLLnnW4I4AnY9GD55Gcacir9jDWZc94m0dddxDa/RU2c24hqA3lVulsY3+XCWMSyrzdD5lbP+k/9uM8fRqxnvmE/9yn8SKOl76NZ2vB1gufBdrbGsHdUd4S1zXepfsR+2D95XsE81ZjNQ05BxDt4xPpfcvCE/TIVea9wS7dgXmGaJ2vG5uge1rInfoKXLVXa0rjV7r7W96eFHikZ/VeobcMBXO1zne0V5Vgi6//AM3wn2Q=
+   eJyFVstOVEEQ7R7ixvSNdxKNa9249vUF8A8s4BvcaQJBJupKjAtdkGj8HzfuSXhECCSTDDMXcCfDDPZJV9nn1m1CJZ2+j+469ThV3e96zo2Dc+e1c3/i8H3n1uO8IeNtHK6fvt84R7mMOvpVer4Kt+/ZqdNaxhzEMQrp+6Zgb91L76ch6z6Q50XBg4zl2yRkHfuhvXdu/ITNK7XryKp82/bOPam6/9Xunvi+K/qbOB/GsRT37AWzQfyGferrWtWOofpsMXjWGCr2QtXOF+cMa/g7MDmODyWWy3XC1r0WE/NFnWPXo3yp70PSsSE+HMm/Q5nXCeN11f63aXy4yRbkCz6PQt6Lea3KOTil2Kudah90/r2b/p3IOi97lb8lWwbik3LP5re0/kr4dlF3cwthH06NvhlxuJHnKfnG/AOPj8x+5Qrn1sb2t+Uoxay0nvPQElPb8InrdEniihot2WJjrDHTXDDn8TyVGgcG8gA+2PipzCVml9Qf5sKX80LMmOvM+Udx/eOqGx/EZbHK9nFeVLQfKd8Ob+mPrIf7sfL4JLT5ZPvC/3eX66yRWGlPvDK+c21j1rrB92Nai1wqtu0LivnNS6x9fm981rHL2MbfrbprC/TCbuTuc+Gfyo+I8SmOmc8+zX3O5YhwtS60V1pboHdM9Vk68yBfeymWE+HZr15bz5deWgddH3zSN6M6GNZGv+ty+cznmComhPup9gjm8ALlXn1HjzumejgTvd/j/NG39V9T7BhzYHtagXcs6K9vqlR3EMTkWvAa8U31Y+b8Myb7xtjAHBo7uAb1rqE+AQ+80H5vMdWPlYJvzBv0z23NSyEGWmNbPuG+F9yx+Dsr9IGR3EnOjb96xil2Y2qI4w7+cH+6lLrfF1vHodzjB3XXHtXnfcZWTkPu+MT9PamV0nm3JOe15hF84P6KeSz3EfVL+1bft2MO7Pvx2wOqB+jmWOH+dhByz1uRHlbKsfLLnnW4I4AnY9GD55Gcacir9jDWZc94m0dddxDa/RU2c24hqA3lV+lsY3+XCWMSyrzdD5lbP+k/9uM8fRpxnvmE/9yn8SKOl76NZ2vB1gufBdrbGsHdUd4S1zXepfsR+2D95XsE81ZjNQ05BxDt4xPpfcvCE/TIVea9wS7dgXmGaJ2vG5uge1rInfoKXLVXa0rjV7r7W96eFHikZ/VeobcMBXO1zne0V5Vgi6//AAwxoE8=
  </data>
 </layer>
 <layer name="Above" width="30" height="30">
@@ -138,9 +138,9 @@
   eJy1V9GNwjAMLf0+pAITHMdNwDDZAHRjoBuCkRiFL6Rjg6tRA677bCdWeVIUoMHv+cVx4NI1U6yaZrFi85vwJ7hP7ev1b9sUgWLcUQ4BLTnOscPP+JzhcWv6TiC/xNZJbxBq80achJHXhftN3DLeM06gZh7flXUH4pTWI/c96yytKaRF826yv8r6Yzetoyi02kD1CX1V9Fu6JGdUP6+RpxbFs6y9BrUeI88IsgfU5hvd52SsR/2xpE9EePn5lrl4+yK9k+8tXu98a/kSx0E8S4b/o3MRBOIk8M+0+MS/Wfrx+Yzic8xRC8RFvmm5cR6tn2pn8OLUQQKcvDdJna3jX8nZQ5wWSu8QifNiyhtBlD/DylW74zKscyyh6fQ4ENa9dxs2PNTonBOpsuej++6zz2/bjy82dv34HvJG8Wt+j16N/kn8e+Cv2ldm+G9Anv0sx/eZl4Ps3VZN3T6MGAPeUS9ck+yHmTvaA0q4NOT+ruEfps56Pw==
  </data>
 </layer>
- <layer name="Walkable" width="30" height="30" visible="0">
+ <layer name="Walkable" width="30" height="30">
  <data encoding="base64" compression="zlib">
-   eJzFk0ESwCAIA31CP+X/v9STMz0oCSRSZrxYYIWk8xljimcXas9TXxSozsXNvrHCZfIr+4/mcOjW4ZFTH8RR34DC4amu3WX/MWb/X192eUnRxaW/yydIL+Y+4znnbtR5UE03m81dOYwWTiajZUZvxN3Vn2pc3GgudZfMvDd8tu4jvRRmNdy+ZRkZP59q3Fw2KlzmW5aLfBsxGW2reWgX7sPs/ybvD66z7wupnciN
+   eJzFk8ENwDAIAzNCl8r+K/WF1EfABhyKlE8DXMDuftbazXOKbk+vLwpUp+Jm31jhMvmV/UdzKHSb8IjXB3G6b0Ch8NTU7rL/GLP/ry+nvNTRRaW/yidIL+Z7xnPK3XTnQTXTbDbXchgtlExGy4zeiHuq92pU3Giu7i6ZeW/4zL5HenWY1VD7lmVk/OzVqLlsVLjMnd2zXOTbiMloW81Du1AfZv83eX9wlX1feiDI4g==
  </data>
 </layer>
 <objectgroup name="Mapevents" width="30" height="30">
@@ -199,102 +199,68 @@
   </properties>
  </object>
 </objectgroup>
- <objectgroup name="Spawn" width="30" height="30" visible="0">
-  <object name="forestregral2" type="spawn" x="448" y="32" width="256" height="96">
-   <properties>
-    <property name="quantity" value="3"/>
-   </properties>
-  </object>
-  <object name="slargrum_1" type="spawn" x="704" y="64" width="32" height="32"/>
-  <object name="werewolf_1" type="spawn" x="736" y="32" width="192" height="96">
-   <properties>
-    <property name="quantity" value="3"/>
-   </properties>
-  </object>
-  <object name="urdom_1" type="spawn" x="288" y="64" width="160" height="96"/>
-  <object name="undeadcr1" type="spawn" x="32" y="192" width="128" height="64">
+ <objectgroup name="Spawn" width="30" height="30">
+  <object name="lbridge" type="spawn" x="736" y="736" width="32" height="32"/>
+  <object name="yjacket1" type="spawn" x="416" y="64" width="128" height="32">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
  </object>
-  <object name="zortak_2" type="spawn" x="128" y="128" width="160" height="64"/>
-  <object name="slargrum_5" type="spawn" x="256" y="192" width="128" height="64"/>
-  <object name="undeadcr2" type="spawn" x="384" y="224" width="160" height="64">
+  <object name="yjacket1" type="spawn" x="640" y="64" width="256" height="64">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
  </object>
-  <object name="slargrum_6" type="spawn" x="544" y="256" width="192" height="32"/>
-  <object name="zortak_2" type="spawn" x="736" y="160" width="192" height="128">
+  <object name="zortak1" type="spawn" x="128" y="128" width="160" height="64"/>
+  <object name="zortak2" type="spawn" x="160" y="352" width="32" height="32"/>
+  <object name="zortak1" type="spawn" x="256" y="320" width="128" height="32"/>
+  <object name="zortak1" type="spawn" x="288" y="192" width="160" height="64"/>
+  <object name="zortak2" type="spawn" x="480" y="224" width="32" height="32"/>
+  <object name="zortak2" type="spawn" x="512" y="352" width="32" height="64">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
  </object>
-  <object name="zortak_3" type="spawn" x="32" y="288" width="128" height="128"/>
-  <object name="undeadcr2" type="spawn" x="160" y="288" width="128" height="128">
+  <object name="zortak1" type="spawn" x="576" y="256" width="32" height="32"/>
+  <object name="zortak2" type="spawn" x="672" y="256" width="32" height="32"/>
+  <object name="zortak1" type="spawn" x="736" y="160" width="160" height="128"/>
+  <object name="zortak2" type="spawn" x="640" y="384" width="96" height="32">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
  </object>
-  <object name="slargrum_6" type="spawn" x="288" y="320" width="160" height="64"/>
-  <object name="zortak_2" type="spawn" x="448" y="352" width="192" height="64">
+  <object name="hanklbit1" type="spawn" x="64" y="288" width="96" height="128"/>
+  <object name="zortak2" type="spawn" x="832" y="736" width="32" height="64">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
  </object>
-  <object name="slargrum_6" type="spawn" x="640" y="384" width="96" height="32"/>
-  <object name="zortak_2" type="spawn" x="736" y="384" width="64" height="64"/>
-  <object name="slargrum_6" type="spawn" x="768" y="448" width="64" height="128">
+  <object name="zortakb" type="spawn" x="128" y="448" width="96" height="96"/>
+  <object name="zortak2" type="spawn" x="160" y="576" width="32" height="96">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
  </object>
-  <object name="undeadcr2" type="spawn" x="832" y="512" width="96" height="128">
+  <object name="zortak1" type="spawn" x="96" y="672" width="160" height="128">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
  </object>
-  <object name="zortak_2" type="spawn" x="832" y="640" width="96" height="192">
-   <properties>
-    <property name="quantity" value="3"/>
-   </properties>
-  </object>
-  <object name="monster_guard" type="spawn" x="640" y="736" width="192" height="64"/>
-  <object name="undeadcr2" type="spawn" x="448" y="672" width="192" height="96">
+  <object name="zortak2" type="spawn" x="288" y="672" width="96" height="32"/>
+  <object name="zortak1" type="spawn" x="416" y="608" width="32" height="32"/>
+  <object name="zortak1" type="spawn" x="448" y="480" width="192" height="128"/>
+  <object name="lodar_fg4" type="spawn" x="288" y="64" width="96" height="96"/>
+  <object name="zortak1" type="spawn" x="768" y="448" width="160" height="128">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
  </object>
-  <object name="zortak_3" type="spawn" x="384" y="768" width="96" height="96"/>
-  <object name="slargrum_7" type="spawn" x="256" y="864" width="192" height="64">
+  <object name="vscale1" type="spawn" x="608" y="704" width="32" height="64">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
  </object>
-  <object name="zortak_1" type="spawn" x="64" y="672" width="32" height="32"/>
-  <object name="slargrum_5" type="spawn" x="160" y="544" width="32" height="160"/>
-  <object name="undeadcr1" type="spawn" x="96" y="704" width="160" height="160">
-   <properties>
-    <property name="quantity" value="3"/>
-   </properties>
-  </object>
-  <object name="slargrum_6" type="spawn" x="192" y="640" width="192" height="64">
-   <properties>
-    <property name="quantity" value="2"/>
-   </properties>
-  </object>
-  <object name="zortak_1" type="spawn" x="128" y="448" width="96" height="96"/>
-  <object name="undeadcr1" type="spawn" x="448" y="480" width="192" height="128">
-   <properties>
-    <property name="quantity" value="2"/>
-   </properties>
-  </object>
-  <object name="slargrum_5" type="spawn" x="384" y="576" width="64" height="32">
-   <properties>
-    <property name="quantity" value="2"/>
-   </properties>
-  </object>
-  <object name="undeadcr1" type="spawn" x="384" y="640" width="64" height="32">
+  <object name="vscale1" type="spawn" x="320" y="704" width="288" height="192">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
--- a/AndorsTrail/res/xml/lodar8cave0.tmx
+++ b/AndorsTrail/res/xml/lodar8cave0.tmx
@@ -1,125 +1,124 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="25" height="17" tilewidth="32" tileheight="32">
 <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="576" height="192"/>
 </tileset>
 <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="576" height="192"/>
 </tileset>
 <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="576" height="192"/>
 </tileset>
 <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="480" height="256"/>
 </tileset>
 <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="480" height="256"/>
 </tileset>
 <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="512" height="256"/>
 </tileset>
 <layer name="Ground" width="25" height="17">
  <data encoding="base64" compression="zlib">
@@ -136,7 +135,7 @@
   eJxjYBi6IF2AODFi9WKTT8OiLpwIO0D6seklVp4YOwipoVSeGDXiTJTJE6uG2PiiRA0hdyCHBS6ziE0bxNiByyxK4g093eFSRygscKVfbOL4zCI2LIgRJyZO0NWQagcucXxhiiuf0yJ+0QGusCcmzxFrB60BANdWFgg=
  </data>
 </layer>
- <layer name="Walkable" width="25" height="17" visible="0">
+ <layer name="Walkable" width="25" height="17">
  <data encoding="base64" compression="zlib">
   eJxzFWBgcB3FODEIDJQdxNqNTx0ywCWHzxx0QKodtDADnzw2f5FrDjl2EOtXYuKSGDPItYPUsMLlV2LTJTHuJMUObO4ixw58fsMmR0xYYNNDSvhS0w5C8YMN4JMn1Q5qYACWx2uV
  </data>
@@ -155,36 +154,60 @@
   </properties>
  </object>
 </objectgroup>
- <objectgroup name="Spawn" width="25" height="17" visible="0">
-  <object name="slargrum_1" type="spawn" x="640" y="96" width="96" height="160">
+ <objectgroup name="Spawn" width="25" height="17">
+  <object name="mudfiend" type="spawn" x="224" y="352" width="32" height="32"/>
+  <object name="mudfiend" type="spawn" x="416" y="352" width="32" height="128">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
  </object>
-  <object name="forestregral2" type="spawn" x="640" y="384" width="64" height="32">
+  <object name="mudfiend" type="spawn" x="288" y="480" width="128" height="32">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
  </object>
-  <object name="urdom_1" type="spawn" x="512" y="480" width="160" height="32"/>
-  <object name="slargrum_1" type="spawn" x="512" y="384" width="32" height="32"/>
-  <object name="werewolf_1" type="spawn" x="352" y="128" width="192" height="224">
+  <object name="mudfiend" type="spawn" x="544" y="480" width="96" height="32">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
  </object>
-  <object name="forestregral2" type="spawn" x="320" y="128" width="224" height="224"/>
-  <object name="slargrum_1" type="spawn" x="256" y="480" width="192" height="32"/>
-  <object name="forestregral2" type="spawn" x="416" y="416" width="32" height="32"/>
-  <object name="urdom_1" type="spawn" x="224" y="416" width="64" height="32">
+  <object name="mudfiend" type="spawn" x="512" y="352" width="32" height="128">
+   <properties>
+    <property name="quantity" value="2"/>
+   </properties>
+  </object>
+  <object name="mudfiend" type="spawn" x="672" y="256" width="32" height="128">
+   <properties>
+    <property name="quantity" value="2"/>
+   </properties>
+  </object>
+  <object name="mudfiend" type="spawn" x="640" y="416" width="32" height="64">
+   <properties>
+    <property name="quantity" value="2"/>
+   </properties>
+  </object>
+  <object name="mudfiend" type="spawn" x="32" y="320" width="128" height="160">
+   <properties>
+    <property name="quantity" value="2"/>
+   </properties>
+  </object>
+ </objectgroup>
+ <objectgroup name="Spawn_bats" width="25" height="17" visible="0">
+  <object name="cavebat1" type="spawn" x="32" y="192" width="256" height="320">
+   <properties>
+    <property name="quantity" value="2"/>
+   </properties>
+  </object>
+  <object name="cavebat1" type="spawn" x="352" y="128" width="192" height="224">
+   <properties>
+    <property name="quantity" value="2"/>
+   </properties>
+  </object>
+  <object name="cavebat1" type="spawn" x="640" y="128" width="96" height="128">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
  </object>
-  <object name="slargrum_1" type="spawn" x="192" y="224" width="64" height="128"/>
-  <object name="urdom_1" type="spawn" x="64" y="128" width="96" height="160"/>
-  <object name="werewolf_1" type="spawn" x="128" y="352" width="32" height="32"/>
-  <object name="slargrum_1" type="spawn" x="64" y="384" width="96" height="96"/>
 </objectgroup>
 <objectgroup name="Keys" width="25" height="17"/>
 </map>
--- a/AndorsTrail/res/xml/lodar9.tmx
+++ b/AndorsTrail/res/xml/lodar9.tmx
@@ -128,17 +128,17 @@
   eJzFlk0OgjAQhbExntczeAXlCFBvALhn46msiZMMQ+evLXHxFtTQr29mHnW9dN36B93CVp73roLoXpTxCFv1ZD3HHNJ6TJoFDWG/t6Q+s0ZrMiUtSW9Bk5Od45YK2CMS1KkVQ2Lj+kOdWnqOTG1x/VvXOv68ePtawwUmzPuXfS88u+VsuGc0axp3DPt5W4xc6Fku4xqX5t3CBO75xEvj0rx7ZqCGWyr4nnI6ihsV7lHM3AzDvVOzN55x/Cwxc7Wld4rmB8/4M8hZ5bhcjzGf+sEz/gpyVkt6iu8mzU/L+cV3k+bHypXqC7KwLP+/NL/0d41j/V5481KSPc4r51nKl+es1HMJ9wPAxdty
  </data>
 </layer>
- <layer name="Objects" width="30" height="25" visible="0">
+ <layer name="Objects" width="30" height="25">
  <data encoding="base64" compression="zlib">
   eJyNVr1uFDEQXi+iQbvSrgKihoYaIZ6AvAPFPQH0FCBChFIFiQIKUBDvQ0MRaCLdXsQFIkW63B53UHF/MJ88c56dXZ8YybLXHs83P5/trbIkGVN7TA3yKE+S4yJJlvR9Qf0ufU+pnxWhX9DaYe71T2l8i8a3qV2hNqFvR31KrU/jr6R/Tn1FbUjtR+b3WJsHKa1T/zL149/wpyQ71H7RvCv9GmyO2A4EeF9o/Z3z/gIH+7+zrWODAVtiE/2M9bTOSeGxgXnGOFZ+uvbcN9aFf0NlY5U1MSUeYGo/xAfJ55s02Ja1v66pKzJWOV2xH3UWsCSXs6KZV5sL2ADu27Tpn+21bxLnpcoVdFCPyyysP6TvvYi9jZ9JHLMTGxxQtRA7E1O315G4t2HqvGns94T3kdra+TyB39AF9x7kYQ8EObiThxxIX2fb/ZG86nnwfMj8F6l5PM+a8YsIF3COF3z2dE02feJj2eRW1RTnGftWJqcLPtPaxpLvk5GsGXFcqw8uYCIG2AL2VZ4fm70S1666d3QekPebkT1YK53n3w7XDL2069RuuGCv61xA5MzXyvenefceK2uyfUT7Dqk9yX1eMV6Kz7YeKqc4859wrtn3P9e6MSVe4QLiEd0j9hmYMhY9xIf7VN/18BH1w10oeTlwTf80ZsU6dznPJdfjnvO1RI9c3XesWzbvnBb3jayYVwPFtx3mtJz1M+b2Ogs8QYy438fMsVh9Y3eNztOIz0+XuDyM5T0ReUbj56btcbyxO0dy0Vd4lRqDBzoe+54Ac79ov7MvGN/WT0vd8bYJZmUw7T3WK7rfDWBPLNeVTJnfIuD7K+b72AVM+2ZjTmLd9q6dFElLYFt8wR3xOQ16qPXAtfPU53gFc5A1+WtrDZFzv8FMAj8lJ3PFLctTXT/k97QDc5/fWv1foOsFP+WuuSia/zxT/meS2lguai7pc9Hj98jO6/8P4JTmH1LHtczavMCeLkxdazsvuWvEteVcYx331JzfEdQd/5Ax/sbm/werC1v+lc75P7sX4W9s/h+CPHK0
  </data>
 </layer>
- <layer name="Above" width="30" height="25" visible="0">
+ <layer name="Above" width="30" height="25">
  <data encoding="base64" compression="zlib">
   eJzNVYkNwjAMbDoBhQn4FgB2YYMyB+pwrAMb4AgiGePYF6tCnJRGjWxfznbdrvtf3Ba/4bmAPKgdijMYb2R29xnu4PE+AA7LpuRJ2kw9PQY7LqKvxj2K8xyr2Fq1a8kpkhtui9aYI9pnXEcrb+aU+atxWDnQeKUP12dxFj+vPvzuls8yvfZVsjlRcE6Jlj6JwLvnmjRuaG2VtaO1T1icCA4U+/heGWU/GXkv4PXjOwKk51v1etxa76m+NPfS8LlHITk1ZO5r/30+KWcydu3d48xIji7tn1708HzJWnqcmlYP2uxBZqDJKescRGufRvSj0LTOOd94j/H+0DRFa63B+xY45p7n6D++1kNPjIdImw==
  </data>
 </layer>
- <layer name="Walkable" width="30" height="25" visible="0">
+ <layer name="Walkable" width="30" height="25">
  <data encoding="base64" compression="zlib">
   eJxzFWBgcB3Fo5hGGAQGyl4YoJcfcdlHTTegA1x+JQTItY+QWdSwF58+YsXR5Uixl5z4ICfcSA0XYt1JDbuR5YhxJyn+oNTt+OzFpZ4YP5DqHkJpktw0RUyaJmQ2uXbSIo8MBTtxxSct/UMI0MouYsKAGvbRM37JNWMg0jM10hgAyabA6g==
  </data>
@@ -175,64 +175,74 @@
   </properties>
  </object>
 </objectgroup>
- <objectgroup name="Spawn" width="30" height="25" visible="0">
-  <object name="forestregral1" type="spawn" x="96" y="640" width="128" height="64">
+ <objectgroup name="Spawn" width="30" height="25">
+  <object name="khakin1" type="spawn" x="736" y="224" width="192" height="128">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
  </object>
-  <object name="forestregral2" type="spawn" x="224" y="608" width="192" height="64">
+  <object name="khakin1" type="spawn" x="704" y="416" width="96" height="128"/>
+  <object name="khakin2" type="spawn" x="480" y="352" width="64" height="64">
+   <properties>
+    <property name="quantity" value="2"/>
+   </properties>
+  </object>
+  <object name="khakin2" type="spawn" x="544" y="352" width="64" height="64">
+   <properties>
+    <property name="quantity" value="2"/>
+   </properties>
+  </object>
+  <object name="khakin3" type="spawn" x="608" y="352" width="64" height="64">
+   <properties>
+    <property name="quantity" value="2"/>
+   </properties>
+  </object>
+  <object name="khakin1" type="spawn" x="672" y="352" width="64" height="64">
+   <properties>
+    <property name="quantity" value="2"/>
+   </properties>
+  </object>
+  <object name="khakin2" type="spawn" x="160" y="224" width="288" height="160">
   <properties>
    <property name="quantity" value="3"/>
   </properties>
  </object>
-  <object name="slargrum_1" type="spawn" x="416" y="576" width="64" height="160">
+  <object name="khakin2" type="spawn" x="64" y="448" width="32" height="32"/>
+  <object name="khakin3" type="spawn" x="64" y="160" width="96" height="192">
+   <properties>
+    <property name="quantity" value="2"/>
+   </properties>
+  </object>
+  <object name="forestfly1" type="spawn" x="64" y="672" width="32" height="64">
+   <properties>
+    <property name="quantity" value="2"/>
+   </properties>
+  </object>
+  <object name="forestfly1" type="spawn" x="160" y="640" width="64" height="64">
+   <properties>
+    <property name="quantity" value="2"/>
+   </properties>
+  </object>
+  <object name="forestfly1" type="spawn" x="352" y="544" width="128" height="160">
   <properties>
    <property name="quantity" value="3"/>
   </properties>
  </object>
-  <object name="werewolf_1" type="spawn" x="448" y="448" width="224" height="128">
+  <object name="hanklbit1" type="spawn" x="224" y="640" width="32" height="32"/>
+  <object name="hanklbit1" type="spawn" x="288" y="640" width="32" height="32"/>
+  <object name="forestfly1" type="spawn" x="480" y="448" width="192" height="128">
   <properties>
-    <property name="quantity" value="4"/>
+    <property name="quantity" value="3"/>
   </properties>
  </object>
-  <object name="zortak_4" type="spawn" x="736" y="224" width="192" height="128">
+  <object name="forestfly2" type="spawn" x="416" y="704" width="64" height="32">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
  </object>
-  <object name="slargrum_10" type="spawn" x="704" y="448" width="96" height="96"/>
-  <object name="slargrum_9" type="spawn" x="736" y="416" width="32" height="32"/>
-  <object name="xalirg_4" type="spawn" x="480" y="352" width="32" height="64">
+  <object name="khakin2" type="spawn" x="160" y="384" width="288" height="160">
   <properties>
-    <property name="quantity" value="2"/>
-   </properties>
-  </object>
-  <object name="slargrum_10" type="spawn" x="544" y="352" width="32" height="64">
-   <properties>
-    <property name="quantity" value="2"/>
-   </properties>
-  </object>
-  <object name="zortak_4" type="spawn" x="608" y="352" width="32" height="64">
-   <properties>
-    <property name="quantity" value="2"/>
-   </properties>
-  </object>
-  <object name="slargrum_9" type="spawn" x="672" y="352" width="32" height="64">
-   <properties>
-    <property name="quantity" value="2"/>
-   </properties>
-  </object>
-  <object name="xalirg_4" type="spawn" x="192" y="224" width="288" height="320">
-   <properties>
-    <property name="quantity" value="6"/>
-   </properties>
-  </object>
-  <object name="slargrum_10" type="spawn" x="160" y="224" width="320" height="320"/>
-  <object name="zortak_4" type="spawn" x="64" y="448" width="32" height="32"/>
-  <object name="xalirg_5" type="spawn" x="32" y="160" width="128" height="192">
-   <properties>
-    <property name="quantity" value="2"/>
+    <property name="quantity" value="3"/>
   </properties>
  </object>
 </objectgroup>
--- a/AndorsTrail/res/xml/lodarcave0.tmx
+++ b/AndorsTrail/res/xml/lodarcave0.tmx
@@ -137,7 +137,7 @@
 </layer>
 <layer name="Walkable" width="20" height="15">
  <data encoding="base64" compression="zlib">
-   eJxzFWBgcB3BGB0Qo56QGcSaiU8dujg2tbjsIuRGYtyNTS8h84iVJ1WcXH30Mo/YsCA1LZHqblLUw/jE2EdqHqLELEIYAGuGRw8=
+   eJxzFWBgcB3BGB0Qo56QGcSaiU8dujg2tbjsIuRGYtyNTS8h84iVJ1WcXH30Mo/YsCA1LZHqblLUw/jE2EeKHdQwCx8GAI9SR2Q=
  </data>
 </layer>
 <objectgroup name="Mapevents" width="20" height="15">
@@ -155,28 +155,27 @@
  </object>
  <object name="sign_lodarcave0" type="sign" x="256" y="192" width="160" height="224"/>
 </objectgroup>
- <objectgroup name="Spawn" width="20" height="15" visible="0">
-  <object name="zortak_4" type="spawn" x="64" y="160" width="96" height="224"/>
-  <object name="xalirg_5" type="spawn" x="32" y="96" width="160" height="160"/>
-  <object name="slargrum_9" type="spawn" x="192" y="160" width="160" height="256">
+ <objectgroup name="Spawn" width="20" height="15">
+  <object name="hirathil0" type="spawn" x="64" y="160" width="96" height="224"/>
+  <object name="hirathil0" type="spawn" x="32" y="96" width="160" height="160"/>
+  <object name="hirathil0" type="spawn" x="448" y="160" width="32" height="32"/>
+  <object name="hirathil0" type="spawn" x="480" y="128" width="32" height="64">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
  </object>
-  <object name="undeadcr3" type="spawn" x="352" y="160" width="128" height="32">
+  <object name="hirathil0" type="spawn" x="544" y="192" width="64" height="192"/>
+  <object name="hirathil0" type="spawn" x="512" y="384" width="32" height="64">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
  </object>
-  <object name="zortak_4" type="spawn" x="512" y="96" width="32" height="64">
+  <object name="hirathil0" type="spawn" x="192" y="160" width="224" height="256"/>
+ </objectgroup>
+ <objectgroup name="Spawn_bats" width="20" height="15">
+  <object name="cavebat1" type="spawn" x="32" y="160" width="416" height="256">
   <properties>
-    <property name="quantity" value="2"/>
-   </properties>
-  </object>
-  <object name="slargrum_10" type="spawn" x="544" y="192" width="64" height="192"/>
-  <object name="xalirg_5" type="spawn" x="512" y="384" width="32" height="64">
-   <properties>
-    <property name="quantity" value="2"/>
+    <property name="quantity" value="4"/>
   </properties>
  </object>
 </objectgroup>
--- a/AndorsTrail/res/xml/lodarcave1.tmx
+++ b/AndorsTrail/res/xml/lodarcave1.tmx
@@ -1,125 +1,124 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="18" height="30" tilewidth="32" tileheight="32">
 <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="576" height="192"/>
 </tileset>
 <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="576" height="192"/>
 </tileset>
 <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="576" height="192"/>
 </tileset>
 <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="480" height="256"/>
 </tileset>
 <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="480" height="256"/>
 </tileset>
 <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="512" height="256"/>
 </tileset>
 <layer name="Ground" width="18" height="30">
  <data encoding="base64" compression="zlib">
@@ -136,7 +135,7 @@
   eJxjYKAuSBcgToyQGWlY9GATwwfCSVQ/VMwRZyJNPanhjwuQ4n58dpJiDj61hMxBdgO+tINPDldaJBUMpjQ02PxEanqmFqBWviAnLAciT+IC5KQHbO4nxwxS9OAKM1gYTOUlzhxcYUZqWFLLHFzpn5x8MZjSFTZzANelE9o=
  </data>
 </layer>
- <layer name="Walkable" width="18" height="30" visible="0">
+ <layer name="Walkable" width="18" height="30">
  <data encoding="base64" compression="zlib">
   eJzNk8ERwCAIBC3Bpuy/pUwe+WQE3ANjmPEjuHoHjt7a+Om6o4LxRIZLQ2FY9Z435F6icyeH9CBinNJF+0VniDKsXOYtih8KQ/kbpN8Zjjq3yjxW6qSsKv9nZyjrrWmFM8tZ9RHD8yPSqnrp7Vu5ivqvORcK53ky
  </data>
@@ -155,39 +154,44 @@
   </properties>
  </object>
 </objectgroup>
- <objectgroup name="Spawn" width="18" height="30" visible="0">
-  <object name="slargrum_10" type="spawn" x="32" y="96" width="256" height="192">
+ <objectgroup name="Spawn" width="18" height="30">
+  <object name="hirathil0" type="spawn" x="32" y="128" width="256" height="160">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
  </object>
-  <object name="undeadcr3" type="spawn" x="288" y="128" width="160" height="32"/>
-  <object name="xalirg_5" type="spawn" x="448" y="256" width="32" height="32"/>
-  <object name="slargrum_9" type="spawn" x="352" y="288" width="128" height="160"/>
-  <object name="zortak_4" type="spawn" x="192" y="288" width="32" height="32"/>
-  <object name="slargrum_10" type="spawn" x="32" y="352" width="320" height="224">
+  <object name="hirathil0" type="spawn" x="288" y="128" width="128" height="32"/>
+  <object name="hirathil0" type="spawn" x="448" y="256" width="32" height="32"/>
+  <object name="hirathil0" type="spawn" x="352" y="288" width="128" height="160"/>
+  <object name="hirathil0" type="spawn" x="192" y="288" width="32" height="32"/>
+  <object name="hirathil0" type="spawn" x="32" y="352" width="320" height="224">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
  </object>
-  <object name="undeadcr3" type="spawn" x="0" y="352" width="352" height="224"/>
-  <object name="xalirg_5" type="spawn" x="256" y="576" width="32" height="32"/>
-  <object name="slargrum_9" type="spawn" x="32" y="704" width="320" height="192">
+  <object name="hirathil1" type="spawn" x="256" y="576" width="32" height="32"/>
+  <object name="hirathil0" type="spawn" x="32" y="640" width="320" height="256">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
  </object>
-  <object name="zortak_4" type="spawn" x="0" y="704" width="352" height="192"/>
-  <object name="undeadcr3" type="spawn" x="384" y="640" width="32" height="64">
+  <object name="hirathil0" type="spawn" x="384" y="640" width="32" height="64">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
  </object>
-  <object name="slargrum_10" type="spawn" x="416" y="608" width="128" height="320">
+  <object name="hirathil0" type="spawn" x="416" y="608" width="128" height="288">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
  </object>
 </objectgroup>
+ <objectgroup name="Spawn_bats" width="18" height="30" visible="0">
+  <object name="cavebat1" type="spawn" x="32" y="128" width="512" height="768">
+   <properties>
+    <property name="quantity" value="3"/>
+   </properties>
+  </object>
+ </objectgroup>
 <objectgroup name="Keys" width="18" height="30"/>
 </map>
--- a/AndorsTrail/res/xml/lodarcave2.tmx
+++ b/AndorsTrail/res/xml/lodarcave2.tmx
@@ -1,125 +1,124 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!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"/>
+  <image source="../drawable/map_bed_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="576" height="192"/>
 </tileset>
 <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="576" height="192"/>
 </tileset>
 <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="576" height="192"/>
 </tileset>
 <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="480" height="256"/>
 </tileset>
 <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="480" height="256"/>
 </tileset>
 <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="512" height="256"/>
 </tileset>
 <layer name="Ground" width="15" height="20">
  <data encoding="base64" compression="zlib">
@@ -156,23 +155,34 @@
  </object>
 </objectgroup>
 <objectgroup name="Spawn" width="15" height="20">
-  <object name="xalirg_5" type="spawn" x="128" y="64" width="64" height="32">
+  <object name="hirathil0" type="spawn" x="128" y="64" width="64" height="32">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
  </object>
-  <object name="zortak_4" type="spawn" x="160" y="128" width="160" height="160">
+  <object name="hirathil1" type="spawn" x="160" y="128" width="160" height="192">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
  </object>
-  <object name="slargrum_9" type="spawn" x="32" y="288" width="224" height="256">
+  <object name="hirathil0" type="spawn" x="32" y="320" width="384" height="256">
+   <properties>
+    <property name="quantity" value="5"/>
+   </properties>
+  </object>
+  <object name="hirathil0" type="spawn" x="384" y="224" width="64" height="128"/>
+  <object name="hirathil0" type="spawn" x="224" y="544" width="64" height="32">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
  </object>
-  <object name="undeadcr3" type="spawn" x="384" y="224" width="64" height="128"/>
-  <object name="slargrum_10" type="spawn" x="256" y="352" width="160" height="192"/>
+ </objectgroup>
+ <objectgroup name="Spawn_bats" width="15" height="20">
+  <object name="cavebat1" type="spawn" x="32" y="96" width="416" height="448">
+   <properties>
+    <property name="quantity" value="3"/>
+   </properties>
+  </object>
 </objectgroup>
 <objectgroup name="Keys" width="15" height="20"/>
 </map>
--- a/AndorsTrail/res/xml/lodarcave3.tmx
+++ b/AndorsTrail/res/xml/lodarcave3.tmx
@@ -1,125 +1,124 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="30" height="30" tilewidth="32" tileheight="32">
 <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="576" height="192"/>
 </tileset>
 <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="576" height="192"/>
 </tileset>
 <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="576" height="192"/>
 </tileset>
 <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="480" height="256"/>
 </tileset>
 <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="480" height="256"/>
 </tileset>
 <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="512" height="256"/>
 </tileset>
 <layer name="Ground" width="30" height="30">
  <data encoding="base64" compression="zlib">
@@ -131,7 +130,7 @@
   eJzdVr1OAkEQviPY6F1CozyBlHbGygoSfQPtfAM7TUzUAkOBxvI0qJVP4UP4CCQEQsWftQHRHW7HG4bZZe+k8kvIHne7883/rOf9T/ih5418z7v1zXvOwvRy9zdiuc+C3Bf9bqrWJwtvVkwFmaVc8twJ4nU7t7gPUPPnv9UNOn74i7K53MtC8rsqyHs44BvE49Hgu28/5mxrO4qBLAf07qpv14xbQp/JAB0agn0XQi60gng/7INcwXOnivNe825a7O0I3JSTni2q557eX2P+sXEgUG6F2BEROWX9vmfwKfAP9P6dDTdOBD0HGGmOoV7Pl9RZ058/twxoK5zjPvzVScvaCuw5+ZCyTqU8QW7MNbBDklvX+X3DvmGvMOmCfWpo8U/RYiP663M9XiPdB6pqPVCyD8Okd3GY8oVz7+UXc4baQ/0GMo/U/2P9jsfHZosrwFdSblAf9oXcmNXBkpwxAc7a6mZCuNPUF4U0d0zYzSe5ZuMDvd8c4oxzAer9y2F/VhsRbcIB8Wgy2yFOdM7C/yhlPSPoTIhYP3sN4xqE+gE96PziMzILqAzaO8B/tBZw/k+1X3pBeh/Teh445iPogL35LzFFO7kMGkOIwzuL4VoGTuBqaZ27llyFvlfVfBO13q343lZm86JE5vzsjqqfx6TnwJ60/Qfz5ITwUXlS/PAMnzuon6sOeOfA+QKg/V7KGew3eNdAXaQ5YgKfE2PHeqhkuPevCo0V59cyuN6pED/tDGpf
  </data>
 </layer>
- <layer name="Above" width="30" height="30">
+ <layer name="Above" width="30" height="30" visible="0">
  <data encoding="base64" compression="zlib">
   eJztwwENAAAMAiAjPJ39oxjksNFLqqqq6rsDk6RmqA==
  </data>
@@ -156,51 +155,57 @@
  </object>
 </objectgroup>
 <objectgroup name="Spawn" width="30" height="30">
-  <object name="cavegir1" type="spawn" x="448" y="96" width="192" height="160">
+  <object name="hirathil0" type="spawn" x="448" y="96" width="192" height="160">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
  </object>
-  <object name="cavegir2" type="spawn" x="256" y="320" width="192" height="96"/>
-  <object name="cavegir2" type="spawn" x="32" y="352" width="128" height="192">
+  <object name="hirathil0" type="spawn" x="32" y="352" width="128" height="192">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
  </object>
-  <object name="cavegir2" type="spawn" x="544" y="224" width="160" height="256">
+  <object name="hirathil0" type="spawn" x="544" y="224" width="160" height="256">
   <properties>
    <property name="quantity" value="3"/>
   </properties>
  </object>
-  <object name="cavegir1" type="spawn" x="672" y="160" width="128" height="96"/>
-  <object name="cavegir2" type="spawn" x="736" y="416" width="160" height="128">
+  <object name="hirathil0" type="spawn" x="672" y="160" width="128" height="96"/>
+  <object name="hirathil0" type="spawn" x="736" y="416" width="160" height="128">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
  </object>
-  <object name="cavegir2" type="spawn" x="608" y="640" width="32" height="32"/>
-  <object name="cavegir1" type="spawn" x="480" y="608" width="128" height="64"/>
-  <object name="cavegir2" type="spawn" x="128" y="672" width="192" height="224">
+  <object name="hirathil1" type="spawn" x="608" y="640" width="32" height="32"/>
+  <object name="hirathil0" type="spawn" x="480" y="608" width="128" height="64"/>
+  <object name="hirathil0" type="spawn" x="128" y="672" width="192" height="224">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
  </object>
-  <object name="cavegir3" type="spawn" x="384" y="800" width="32" height="64"/>
-  <object name="cavegir3" type="spawn" x="704" y="800" width="96" height="64"/>
-  <object name="cavegir1" type="spawn" x="64" y="160" width="384" height="256">
+  <object name="hirathil1" type="spawn" x="384" y="800" width="32" height="64"/>
+  <object name="hirathil0" type="spawn" x="704" y="800" width="96" height="64"/>
+  <object name="hirathil0" type="spawn" x="64" y="160" width="384" height="256">
   <properties>
    <property name="quantity" value="4"/>
   </properties>
  </object>
-  <object name="cavegir1" type="spawn" x="704" y="416" width="32" height="32"/>
-  <object name="cavegir1" type="spawn" x="704" y="544" width="96" height="128"/>
-  <object name="cavegir2" type="spawn" x="288" y="576" width="192" height="128">
+  <object name="hirathil1" type="spawn" x="704" y="416" width="32" height="32"/>
+  <object name="hirathil0" type="spawn" x="704" y="544" width="96" height="128"/>
+  <object name="hirathil1" type="spawn" x="288" y="576" width="192" height="128">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
  </object>
-  <object name="cavegir2" type="spawn" x="448" y="768" width="128" height="32"/>
-  <object name="cavegir2" type="spawn" x="576" y="800" width="96" height="96"/>
+  <object name="hirathil1" type="spawn" x="448" y="768" width="128" height="32"/>
+  <object name="hirathil0" type="spawn" x="576" y="800" width="96" height="96"/>
+ </objectgroup>
+ <objectgroup name="Spawn_bats" width="30" height="30" visible="0">
+  <object name="cavebat1" type="spawn" x="32" y="64" width="704" height="480">
+   <properties>
+    <property name="quantity" value="3"/>
+   </properties>
+  </object>
 </objectgroup>
 <objectgroup name="Keys" width="30" height="30"/>
 </map>
--- a/AndorsTrail/res/xml/lodarcave4.tmx
+++ b/AndorsTrail/res/xml/lodarcave4.tmx
@@ -1,125 +1,124 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!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"/>
+  <image source="../drawable/map_bed_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="576" height="192"/>
 </tileset>
 <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="576" height="192"/>
 </tileset>
 <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="576" height="192"/>
 </tileset>
 <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="480" height="256"/>
 </tileset>
 <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="480" height="256"/>
 </tileset>
 <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="512" height="256"/>
 </tileset>
 <layer name="Ground" width="25" height="20">
  <data encoding="base64" compression="zlib">
@@ -161,26 +160,26 @@
   </properties>
  </object>
 </objectgroup>
- <objectgroup name="Spawn" width="25" height="20" visible="0">
-  <object name="cavegir1" type="spawn" x="224" y="96" width="64" height="32">
+ <objectgroup name="Spawn" width="25" height="20">
+  <object name="hirathil1" type="spawn" x="224" y="96" width="64" height="32">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
  </object>
-  <object name="cavegir4" type="spawn" x="64" y="320" width="32" height="96"/>
-  <object name="cavegir3" type="spawn" x="224" y="256" width="192" height="224"/>
-  <object name="cavegir4" type="spawn" x="576" y="384" width="32" height="32"/>
-  <object name="cavegir3" type="spawn" x="512" y="416" width="224" height="192">
+  <object name="hirathil1" type="spawn" x="64" y="320" width="32" height="96"/>
+  <object name="hirathil0" type="spawn" x="224" y="256" width="192" height="224"/>
+  <object name="hirathil1" type="spawn" x="576" y="384" width="32" height="32"/>
+  <object name="hirathil1" type="spawn" x="512" y="416" width="224" height="160">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
  </object>
-  <object name="cavegir3" type="spawn" x="32" y="128" width="224" height="192">
+  <object name="hirathil1" type="spawn" x="32" y="128" width="224" height="192">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
  </object>
-  <object name="cavegir3" type="spawn" x="128" y="480" width="128" height="128">
+  <object name="hirathil1" type="spawn" x="128" y="480" width="128" height="128">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
@@ -190,12 +189,18 @@
    <property name="quantity" value="2"/>
   </properties>
  </object>
-  <object name="cavegir3" type="spawn" x="352" y="128" width="384" height="192">
+  <object name="hirathil1" type="spawn" x="352" y="128" width="384" height="256">
   <properties>
    <property name="quantity" value="4"/>
   </properties>
  </object>
-  <object name="cavegir4" type="spawn" x="320" y="128" width="416" height="256"/>
+ </objectgroup>
+ <objectgroup name="Spawn_bats" width="25" height="20">
+  <object name="cavebat1" type="spawn" x="256" y="128" width="480" height="256">
+   <properties>
+    <property name="quantity" value="3"/>
+   </properties>
+  </object>
 </objectgroup>
 <objectgroup name="Keys" width="25" height="20"/>
 </map>
--- a/AndorsTrail/res/xml/lodarcave4a.tmx
+++ b/AndorsTrail/res/xml/lodarcave4a.tmx
@@ -149,41 +149,45 @@
  </object>
 </objectgroup>
 <objectgroup name="Spawn" width="20" height="20">
-  <object name="harskardaer" type="spawn" x="288" y="256" width="64" height="64">
-   <properties>
-    <property name="respawn" value="unique"/>
-   </properties>
-  </object>
-  <object name="cavegir5" type="spawn" x="256" y="320" width="160" height="64">
+  <object name="hirazinn" type="spawn" x="288" y="256" width="64" height="64"/>
+  <object name="hirathil2" type="spawn" x="256" y="320" width="160" height="64">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
  </object>
-  <object name="cavegir4" type="spawn" x="128" y="384" width="256" height="96">
+  <object name="hirathil2" type="spawn" x="128" y="384" width="256" height="96">
   <properties>
    <property name="quantity" value="3"/>
   </properties>
  </object>
-  <object name="cavegir4" type="spawn" x="128" y="256" width="32" height="128"/>
-  <object name="cavegir5" type="spawn" x="192" y="128" width="64" height="96"/>
-  <object name="cavegir5" type="spawn" x="448" y="192" width="160" height="128">
+  <object name="hirathil2" type="spawn" x="192" y="128" width="64" height="96">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
  </object>
-  <object name="cavegir5" type="spawn" x="256" y="128" width="224" height="64">
+  <object name="hirathil2" type="spawn" x="416" y="128" width="192" height="192">
   <properties>
-    <property name="quantity" value="3"/>
+    <property name="quantity" value="4"/>
   </properties>
  </object>
-  <object name="cavegir4" type="spawn" x="512" y="320" width="32" height="160">
+  <object name="hirathil2" type="spawn" x="352" y="512" width="192" height="96">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
  </object>
-  <object name="cavegir5" type="spawn" x="352" y="544" width="96" height="64"/>
-  <object name="cavegir4" type="spawn" x="448" y="480" width="96" height="96"/>
-  <object name="cavegir3" type="spawn" x="64" y="480" width="32" height="32"/>
 </objectgroup>
- <objectgroup name="Keys" width="20" height="20"/>
+ <objectgroup name="Spawn_bats" width="20" height="20" visible="0">
+  <object name="cavebat2" type="spawn" x="128" y="96" width="480" height="512">
+   <properties>
+    <property name="quantity" value="4"/>
+   </properties>
+  </object>
+ </objectgroup>
+ <objectgroup name="Keys" width="20" height="20">
+  <object name="lodar2:35" type="key" x="64" y="448" width="32" height="96">
+   <properties>
+    <property name="phrase" value="sign_lodarcave4a"/>
+   </properties>
+  </object>
+ </objectgroup>
 </map>
--- a/AndorsTrail/res/xml/lodarcave5.tmx
+++ b/AndorsTrail/res/xml/lodarcave5.tmx
@@ -1,125 +1,124 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!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"/>
+  <image source="../drawable/map_bed_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="576" height="192"/>
 </tileset>
 <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="576" height="192"/>
 </tileset>
 <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="576" height="192"/>
 </tileset>
 <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="480" height="256"/>
 </tileset>
 <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="480" height="256"/>
 </tileset>
 <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="512" height="256"/>
 </tileset>
 <layer name="Ground" width="25" height="20">
  <data encoding="base64" compression="zlib">
@@ -131,7 +130,7 @@
   eJzFVLtuAjEQPKNUka8kfAH8Qj4g/EcqPoGCGihIDyhR2vxVpEgRFQ9TU4FH2Lphz3driigjIeDsnZ3dnduiuMW4LP4UL4F/YfLuf5jr3WXmfWBnr9/9jn537Xk//ecdObw2R3n2Ss5hqecZ+LPnB88VNH1RDOr6DrkZ+D8gTk3H1tafOXvbY6kR/L8hDtqgo5vRL8wP/Y2x0Dohz6R64WyzTsYhnLOOnuBbmWq+qdhV5swkUEdTn6Eh+q+n1BDnNmvgQp/3iTqlvtfwfTSVvsi/TcQvyDNtc5ySLvBgXmf/7I34fxpqxNk9+2EjeGIPoy8deUjqc0qfT4/V75RfmHNn677UvMixbeB+PIU8/O7Kd1sCekeBw5T1M+iU9bHHNT8ynK32DiPll9jHA/Hn7mwgZ/em8mlxuDdX9k0bJnf4N/Y6Zy/+B1LzuAA860Et
  </data>
 </layer>
- <layer name="Above" width="25" height="20">
+ <layer name="Above" width="25" height="20" visible="0">
  <data encoding="base64" compression="zlib">
   eJwLE2BgCBvFo3gUj+JRPIpH8ZDGANdlxzk=
  </data>
@@ -156,43 +155,42 @@
  </object>
 </objectgroup>
 <objectgroup name="Spawn" width="25" height="20">
-  <object name="cavegir5" type="spawn" x="32" y="64" width="192" height="192">
-   <properties>
-    <property name="quantity" value="2"/>
-   </properties>
-  </object>
-  <object name="cavegir5" type="spawn" x="96" y="448" width="128" height="160"/>
-  <object name="cavegir5" type="spawn" x="416" y="96" width="128" height="96"/>
-  <object name="cavegir5" type="spawn" x="608" y="96" width="160" height="192">
-   <properties>
-    <property name="quantity" value="2"/>
-   </properties>
-  </object>
-  <object name="cavegir5" type="spawn" x="192" y="352" width="96" height="32"/>
-  <object name="cavegir6" type="spawn" x="288" y="288" width="160" height="192">
+  <object name="hirathil0" type="spawn" x="416" y="96" width="128" height="96"/>
+  <object name="hirathil1" type="spawn" x="576" y="96" width="192" height="192">
   <properties>
    <property name="quantity" value="3"/>
   </properties>
  </object>
-  <object name="cavegir6" type="spawn" x="480" y="288" width="160" height="224">
+  <object name="hirathil2" type="spawn" x="224" y="352" width="64" height="32"/>
+  <object name="hirathil1" type="spawn" x="288" y="288" width="160" height="192">
+   <properties>
+    <property name="quantity" value="3"/>
+   </properties>
+  </object>
+  <object name="hirathil0" type="spawn" x="480" y="288" width="160" height="224">
   <properties>
    <property name="quantity" value="4"/>
   </properties>
  </object>
-  <object name="cavegir4" type="spawn" x="64" y="256" width="128" height="192">
+  <object name="hirathil1" type="spawn" x="32" y="64" width="192" height="544">
+   <properties>
+    <property name="quantity" value="6"/>
+   </properties>
+  </object>
+  <object name="hirathil1" type="spawn" x="416" y="224" width="64" height="32">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
  </object>
-  <object name="cavegir4" type="spawn" x="0" y="64" width="224" height="192"/>
-  <object name="cavegir3" type="spawn" x="416" y="224" width="64" height="32">
+  <object name="hirathil1" type="spawn" x="544" y="128" width="32" height="32"/>
+  <object name="hirathil1" type="spawn" x="608" y="512" width="32" height="32"/>
+ </objectgroup>
+ <objectgroup name="Spawn_bats" width="25" height="20" visible="0">
+  <object name="cavebat1" type="spawn" x="32" y="64" width="736" height="512">
   <properties>
-    <property name="quantity" value="2"/>
+    <property name="quantity" value="4"/>
   </properties>
  </object>
-  <object name="cavegir6" type="spawn" x="544" y="128" width="32" height="32"/>
-  <object name="cavegir6" type="spawn" x="576" y="96" width="192" height="192"/>
-  <object name="cavegir5" type="spawn" x="608" y="512" width="32" height="32"/>
 </objectgroup>
 <objectgroup name="Keys" width="25" height="20"/>
 </map>
--- a/AndorsTrail/res/xml/lodarcave6.tmx
+++ b/AndorsTrail/res/xml/lodarcave6.tmx
@@ -1,125 +1,124 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="20" height="23" tilewidth="32" tileheight="32">
 <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="576" height="192"/>
 </tileset>
 <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="576" height="192"/>
 </tileset>
 <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="576" height="192"/>
 </tileset>
 <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="480" height="256"/>
 </tileset>
 <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="480" height="256"/>
 </tileset>
 <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="512" height="256"/>
 </tileset>
 <layer name="Ground" width="20" height="23">
  <data encoding="base64" compression="zlib">
@@ -131,7 +130,7 @@
   eJzNVDuuwjAQxIgCPewScgK4CFwFKKhBokavCD0gHrTcgcMg0fMJNQ3gVXZls9gmCa9gpMhRsjsez+66VPoOLEW6nmS+vATzVrjGuLbKxXTcdP4aORYi1QVcY5V+66rsXKShjTlDlnvMeVaOuuaP9JNonjlqjgKcJ4z5w/WgY2fCcBGijN7tBHKoZ7/rnvy99P+DfNAy0lwby6e2w+/YoZnjzHy4/rzGXKxeqbypK/nUt3gn+K2p86f6/S6y9R3phz2hJh31rPlXmTmgHomFmREO2BPqD32wC9SzY50RuJoerQfm3dyxL/XSQL56zbGVaRx5uHXEk+4um5XYsXe1Zt7Hnrr55oDObHsJ/oAmelx9BTHkC/UK1KYhDefUU58QepZO6lHqq1GOuwaQIBd4QmcA3aE5CYHfV/+B5MM7zwb1ddHzFcEDAYM7+Q==
  </data>
 </layer>
- <layer name="Above" width="20" height="23">
+ <layer name="Above" width="20" height="23" visible="0">
  <data encoding="base64" compression="zlib">
   eJwLE2BgCBvFo3gUj+JRPIpHMV4MACpst0k=
  </data>
@@ -156,32 +155,35 @@
  </object>
 </objectgroup>
 <objectgroup name="Spawn" width="20" height="23">
-  <object name="cavegir6" type="spawn" x="416" y="32" width="128" height="192">
+  <object name="hirathil1" type="spawn" x="416" y="64" width="128" height="160">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
  </object>
-  <object name="cavegir7" type="spawn" x="288" y="320" width="256" height="384">
+  <object name="hirathil2" type="spawn" x="448" y="224" width="32" height="96"/>
+  <object name="hirathil1" type="spawn" x="320" y="320" width="224" height="384">
   <properties>
-    <property name="quantity" value="2"/>
+    <property name="quantity" value="5"/>
   </properties>
  </object>
-  <object name="cavegir7" type="spawn" x="448" y="224" width="32" height="96"/>
-  <object name="cavegir8" type="spawn" x="320" y="320" width="224" height="384">
+  <object name="hirathil2" type="spawn" x="352" y="128" width="64" height="32"/>
+  <object name="hirathil1" type="spawn" x="224" y="128" width="128" height="128"/>
+  <object name="hirathil1" type="spawn" x="32" y="256" width="256" height="256">
+   <properties>
+    <property name="quantity" value="4"/>
+   </properties>
+  </object>
+  <object name="hirathil2" type="spawn" x="544" y="544" width="32" height="32"/>
+ </objectgroup>
+ <objectgroup name="Spawn_bats" width="20" height="23" visible="0">
+  <object name="cavebat1" type="spawn" x="32" y="128" width="288" height="384">
   <properties>
    <property name="quantity" value="3"/>
   </properties>
  </object>
-  <object name="cavegir7" type="spawn" x="352" y="128" width="64" height="32"/>
-  <object name="cavegir7" type="spawn" x="224" y="128" width="128" height="128"/>
-  <object name="cavegir8" type="spawn" x="32" y="256" width="256" height="256">
+  <object name="cavebat1" type="spawn" x="320" y="320" width="224" height="384">
   <properties>
-    <property name="quantity" value="2"/>
-   </properties>
-  </object>
-  <object name="cavegir7" type="spawn" x="0" y="256" width="288" height="256">
-   <properties>
-    <property name="quantity" value="2"/>
+    <property name="quantity" value="3"/>
   </properties>
  </object>
 </objectgroup>
--- a/AndorsTrail/res/xml/lodarcave7.tmx
+++ b/AndorsTrail/res/xml/lodarcave7.tmx
@@ -1,125 +1,124 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!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"/>
+  <image source="../drawable/map_bed_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="576" height="192"/>
 </tileset>
 <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="576" height="192"/>
 </tileset>
 <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="576" height="192"/>
 </tileset>
 <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="480" height="256"/>
 </tileset>
 <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="480" height="256"/>
 </tileset>
 <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="512" height="256"/>
 </tileset>
 <layer name="Ground" width="15" height="20">
  <data encoding="base64" compression="zlib">
@@ -131,7 +130,7 @@
   eJxjYBh4MJMRt9wsHHLv8OhBBtOxqPsHFFNjYmB4A6RVmVDlQOLveBgYZvNA+OjyYLuBcneAel/zoMr38UPoqVA73/Bg6hVHUj+NEVO8lBe/f0B6sJkLM8OZF2E/NcEjHHbCwCseSHjiApVAd73FY8YdtLiYCY0jZIAeF5047APpa4WGw08uiFgZNFztuRFqQMAFS3i/QnInLI5AdnchuQkWT69x+CkVKr8Ii/mwcBBF8g8o7pDjvpkR1R5RLOkQHSCnLTEC8YXTDCR990kwQxzNfcS4lxwAALpAI4M=
  </data>
 </layer>
- <layer name="Above" width="15" height="20">
+ <layer name="Above" width="15" height="20" visible="0">
  <data encoding="base64" compression="zlib">
   eJwLE2BgCBvFo3gUj+IhgAEYN3eJ
  </data>
@@ -156,33 +155,35 @@
  </object>
 </objectgroup>
 <objectgroup name="Spawn" width="15" height="20">
-  <object name="cavegir7" type="spawn" x="64" y="160" width="32" height="32"/>
-  <object name="cavegir8" type="spawn" x="96" y="128" width="96" height="192">
+  <object name="hirathil2" type="spawn" x="64" y="160" width="32" height="32"/>
+  <object name="hirathil1" type="spawn" x="96" y="128" width="96" height="192">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
  </object>
-  <object name="cavegir8" type="spawn" x="32" y="320" width="256" height="288">
+  <object name="hirathil1" type="spawn" x="32" y="320" width="256" height="288">
   <properties>
    <property name="quantity" value="4"/>
   </properties>
  </object>
-  <object name="cavegir7" type="spawn" x="0" y="320" width="288" height="288">
+  <object name="hirathil0" type="spawn" x="320" y="416" width="32" height="64">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
  </object>
-  <object name="cavegir5" type="spawn" x="320" y="416" width="32" height="64">
-   <properties>
-    <property name="quantity" value="2"/>
-   </properties>
-  </object>
-  <object name="cavegir7" type="spawn" x="352" y="224" width="96" height="256">
+  <object name="hirathil0" type="spawn" x="352" y="224" width="96" height="256">
+   <properties>
+    <property name="quantity" value="3"/>
+   </properties>
+  </object>
+  <object name="hirathil0" type="spawn" x="288" y="448" width="32" height="32"/>
+ </objectgroup>
+ <objectgroup name="Spawn_bats" width="15" height="20" visible="0">
+  <object name="cavebat1" type="spawn" x="32" y="192" width="256" height="416">
   <properties>
    <property name="quantity" value="3"/>
   </properties>
  </object>
-  <object name="cavegir8" type="spawn" x="288" y="96" width="128" height="128"/>
 </objectgroup>
 <objectgroup name="Keys" width="15" height="20"/>
 </map>
--- a/AndorsTrail/res/xml/lodarhouse0.tmx
+++ b/AndorsTrail/res/xml/lodarhouse0.tmx
@@ -1,125 +1,124 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="26" height="20" tilewidth="32" tileheight="32">
 <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="576" height="192"/>
 </tileset>
 <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="576" height="192"/>
 </tileset>
 <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="576" height="192"/>
 </tileset>
 <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="480" height="256"/>
 </tileset>
 <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="480" height="256"/>
 </tileset>
 <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="512" height="256"/>
 </tileset>
 <layer name="Ground" width="26" height="20">
  <data encoding="base64" compression="zlib">
@@ -128,12 +127,12 @@
 </layer>
 <layer name="Objects" width="26" height="20">
  <data encoding="base64" compression="zlib">
-   eJy1Vd1OU0EQ3i30EDi75ZBGUIJXKgTClYkYg3f4Nj6BT2B8AYmJPo533nihJGChIfwktIVa0ppQBL/J7GaHPYsBEib5Mtszw8x8M7NLr1BKTymlgArQc7+/FvzN226rfSwZk2TNBr8pnH/A9hNo5Ept5+zzSauS0LfntYQtykVyblgfQR+b4NrEuYMcx3k5/gedPo/hb/rw7xZpPl8mWdct6zOXz4wqtWXKMWX98ryfc64UH5KNIpwb8NsxzG8zypHq3boO9gPk+ZOzjuc2dLHahntF8tdcjUXxO8D7qlIrdaVOXE46t8R54PIMXK+pf78FB98vEtkn39uJDLkRa73K3y81109chsBnIM+YR9/1Ts7I964ldoHk1AQfqmcGMQy+jaKeOejHmFsVOgM+IkcNv+cy5uFnJPdAzqlZhN2Ld2UhK88llmX4PEUdT8Qd8fsgYx36Pka7QnxeIsYq8MrpFF6LWqg/W6LmeO9a1/DpGN7JhrPvmeBLd3wo+k47+s7PO8HnTWSLa2hrju138i3qr1iezzPoBWAeWLJcT/c/fEjqVpXeO4r9S9wd6gnlWYTvC2DMctwadNUGbjGfiuvNhbw3zk5z83v4vQh3l/JMIOZDYByYAR4B05b30YvkI9+gput914i9EbOT87suj4wb8xlxfHX0xrXF+3pYlOc3axkPgG+6bI/5pO7smngnSIaJffS5KM+5TtvjvKQpz654k+T8UjF8z3t+vjfgc1dN/xsJvuc34XMf+h9GGM7Z
+   eJy1Vd1OU0EQ3i30EDi75ZBGUIJXKgTClYkYg3f4Nj6BT2B8AYmJPo533nihJGChIfwktIVa0ppQBL/J7GaHPYsBEib5Mnt2tjPzzcxue4VSekopBVSAnvv+WvCet91We1/SJ8maDeemsP4B20+gkSu1nfOZT1qVhPae1xK2KBbJuWF9BH1swtEm1h3EOM7L/j/o9HoMv+njfLdI8/kyybpuWZ+5eGZUqS1T9inzl+v9nGOl+JBsFGHdwLkdw/w2oxip2q3rYD9AnD8567hvQ+erbbhWJH/NVV/kvwO8ryq1UlfqxMWkdctp+h64OANXa6rfb8HB14tE1snXdiJDbPhZr/L+peb8icsQ+AzkGfPou9rJHvnatcQskJyacIbymYEPg71R5DMH/Rh9q0JnwEfEqOF7LmMevkdyDmSfmkWYvXhWFrJyX2JZxpmnyOOJuCN+HqSvQ1/HaFaIz0v4WAVeOZ3Ca5EL1WdL5BzPXesaPh3DM9lw9j0TztIdH4q604y+8/1O8HkT2eIc2pp9+5l8i/wrlvvzDHoBmAeWLOfT/Q8fkrpVpfeOfP8Sd4dqQnEWcfYFMGbZbw26agO3mE/F1eZC3htnp775OfxehLtLcSbg8yEwDswAj4Bpy/PoRfKRb1DT1b5rxNyI3sn+XRdH+o35jDi+Onrj2uJ9PSzK/Zu1jAfAN122x3xSd3ZNvBMkw8Q8+lgU51yn7XFc0hRnV7xJsn8pH77mPd/fG/C5q6b/RoKv+U343If+B0TUztk=
  </data>
 </layer>
 <layer name="Above" width="26" height="20">
  <data encoding="base64" compression="zlib">
-   eJxjYMANjgkwMJzlZmA4x41HERXBV1bi1X7DofajAGG9omzE2yNGQO1xPPYNZv/84yFeDwh8ECDOLTAQDlU7nRFVHJ8ZH0gwH90ebABm1wUkNcTY8Qbo5r9o4QOzB5f+j0TYoc2GoLFhZHsoAfjSJAykoalBdzMx/qE1ICW9oQN8/qE1wGUXNnFC+QomT0kcIOvF5QZ8gNywI0cfTM8ltPRHKD2Sk15h4YoevpSGNzUALrfRGwAAawY+aQ==
+   eJxjYMANjgkwMJzlZmA4x41HERXBV1bi1X7DofajAGG9omzE2yNGQO1xPPYNZv/84yFeDwh8ECDOLTAQDlU7nRFVHJ8ZH0gwH90ebABm1wUkNcTY8Qbo5r9o4QOzB5f+j0TYoQENey0grY0FI9tDCcCXJmEgDU0NupuJ8Q+tASnpDR3g8w+tAS67sIkTylcweUriAFkvLjfgA+SGHTn6YHouoaU/QumRnPQKC1f08KU0vKkBcLmN3gAAWD4+ZQ==
  </data>
 </layer>
 <layer name="Walkable" width="26" height="20" visible="0">
@@ -155,12 +154,17 @@
   </properties>
  </object>
 </objectgroup>
- <objectgroup name="Spawn" width="26" height="20" visible="0">
-  <object name="beetle2" type="spawn" x="32" y="32" width="288" height="256">
+ <objectgroup name="Spawn" width="26" height="20">
+  <object name="beetle2" type="spawn" x="32" y="64" width="288" height="224">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
  </object>
+  <object name="beetle2" type="spawn" x="64" y="320" width="736" height="288">
+   <properties>
+    <property name="quantity" value="4"/>
+   </properties>
+  </object>
 </objectgroup>
 <objectgroup name="Keys" width="26" height="20"/>
 </map>
--- a/AndorsTrail/res/xml/lodarhouse1.tmx
+++ b/AndorsTrail/res/xml/lodarhouse1.tmx
@@ -1,125 +1,124 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="20" height="16" tilewidth="32" tileheight="32">
 <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="576" height="192"/>
 </tileset>
 <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="576" height="192"/>
 </tileset>
 <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="576" height="192"/>
 </tileset>
 <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="480" height="256"/>
 </tileset>
 <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="480" height="256"/>
 </tileset>
 <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="512" height="256"/>
 </tileset>
 <layer name="Ground" width="20" height="16">
  <data encoding="base64" compression="zlib">
@@ -151,6 +150,11 @@
 </objectgroup>
 <objectgroup name="Spawn" width="20" height="16">
  <object name="lodar" type="spawn" x="448" y="96" width="160" height="384"/>
+  <object name="vermin" type="spawn" x="32" y="128" width="384" height="320">
+   <properties>
+    <property name="quantity" value="2"/>
+   </properties>
+  </object>
 </objectgroup>
 <objectgroup name="Keys" width="20" height="16"/>
 </map>
--- a/AndorsTrail/res/xml/lostmine0.tmx
+++ b/AndorsTrail/res/xml/lostmine0.tmx
@@ -1,128 +1,127 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="20" height="20" tilewidth="32" tileheight="32">
 <properties>
  <property name="outside" value="1"/>
 </properties>
 <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="576" height="192"/>
 </tileset>
 <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="576" height="192"/>
 </tileset>
 <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="576" height="192"/>
 </tileset>
 <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="480" height="256"/>
 </tileset>
 <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="480" height="256"/>
 </tileset>
 <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="512" height="256"/>
 </tileset>
 <layer name="Ground" width="20" height="20">
  <data encoding="base64" compression="zlib">
@@ -139,7 +138,7 @@
   eJxjYKA9SBegjnqYeBqJ5oHUfwDij0j6QGYhm4MuTyoIR7LjA5HmHMejNpwEtxATvjDzSFFLSA16GMKAOy8qn1B8wcwhxc+E3IZMg4Ai0E1KvNjVw8B0RuziaXj8CgJHgeLHoHKXiPADLrMuQMWuAulrOMxxwOIH9HB7DuU/wGLGOx4GBhcC4UBqPLzhQbAZeTHDAGbeBSRxfPntNQ92cULuYxREsN9CzQDF6QUC/pFlQuVfJMH/zgTCcrgDAM/nKg4=
  </data>
 </layer>
- <layer name="Walkable" width="20" height="20" visible="0">
+ <layer name="Walkable" width="20" height="20">
  <data encoding="base64" compression="zlib">
   eJxzFWBgcMWDYQCfGlLwYDQPG6DUHHxmk2sXsnpc7IEOU1z6yDEPlzvICTd0NrnxQCygRtrD5lZi/YqNxmY2JX4lNU5w+Ydc83DFLy59pIYjPv9SkpYpNYuUOKQ1BgAtFmLz
  </data>
@@ -158,29 +157,35 @@
   </properties>
  </object>
 </objectgroup>
- <objectgroup name="Spawn" width="20" height="20" visible="0">
-  <object name="mpr8" type="spawn" x="256" y="32" width="64" height="96"/>
-  <object name="mpr7" type="spawn" x="96" y="128" width="96" height="32"/>
-  <object name="mpr8" type="spawn" x="320" y="128" width="64" height="64"/>
-  <object name="mpr8" type="spawn" x="416" y="128" width="64" height="128">
+ <objectgroup name="Spawn" width="20" height="20">
+  <object name="charwdg3" type="spawn" x="256" y="64" width="64" height="32">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
  </object>
-  <object name="mpr7" type="spawn" x="320" y="256" width="192" height="128">
+  <object name="charwdg3" type="spawn" x="384" y="128" width="32" height="32"/>
+  <object name="charwdg3" type="spawn" x="416" y="192" width="64" height="32">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
  </object>
-  <object name="mpr8" type="spawn" x="448" y="416" width="128" height="96"/>
-  <object name="mpr8" type="spawn" x="448" y="384" width="32" height="32"/>
-  <object name="mpr8" type="spawn" x="256" y="288" width="32" height="32"/>
-  <object name="mpr8" type="spawn" x="96" y="288" width="288" height="320">
+  <object name="charwdg3" type="spawn" x="256" y="288" width="32" height="32"/>
+  <object name="charwdg2" type="spawn" x="96" y="320" width="480" height="288">
   <properties>
-    <property name="quantity" value="3"/>
+    <property name="quantity" value="6"/>
+   </properties>
+  </object>
+  <object name="charwdg2" type="spawn" x="96" y="96" width="288" height="96">
+   <properties>
+    <property name="quantity" value="2"/>
+   </properties>
+  </object>
+ </objectgroup>
+ <objectgroup name="Keys" width="20" height="20">
+  <object name="charwood2:15" type="key" x="224" y="224" width="96" height="32">
+   <properties>
+    <property name="phrase" value="sign_lostmine0"/>
   </properties>
  </object>
-  <object name="mpr7" type="spawn" x="64" y="288" width="320" height="320"/>
 </objectgroup>
- <objectgroup name="Keys" width="20" height="20"/>
 </map>
--- a/AndorsTrail/res/xml/lostmine4.tmx
+++ b/AndorsTrail/res/xml/lostmine4.tmx
@@ -1,125 +1,124 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="15" height="17" tilewidth="32" tileheight="32">
 <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="576" height="192"/>
 </tileset>
 <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="576" height="192"/>
 </tileset>
 <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="576" height="192"/>
 </tileset>
 <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="480" height="256"/>
 </tileset>
 <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="480" height="256"/>
 </tileset>
 <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="512" height="256"/>
 </tileset>
 <layer name="Ground" width="15" height="17">
  <data encoding="base64" compression="zlib">
@@ -154,6 +153,7 @@
    <property name="place" value="up lostmine5"/>
   </properties>
  </object>
+  <object name="sign_lostmine4" type="sign" x="224" y="224" width="96" height="32"/>
 </objectgroup>
 <objectgroup name="Spawn" width="15" height="17" visible="0">
  <object name="fardaph_4" type="spawn" x="160" y="128" width="224" height="160">
--- a/AndorsTrail/res/xml/minerhouse0.tmx
+++ b/AndorsTrail/res/xml/minerhouse0.tmx
@@ -1,125 +1,124 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="20" height="8" tilewidth="32" tileheight="32">
 <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="576" height="192"/>
 </tileset>
 <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="576" height="192"/>
 </tileset>
 <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="576" height="192"/>
 </tileset>
 <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="480" height="256"/>
 </tileset>
 <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="480" height="256"/>
 </tileset>
 <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="512" height="256"/>
 </tileset>
 <layer name="Ground" width="20" height="8">
  <data encoding="base64" compression="zlib">
@@ -150,17 +149,18 @@
  </object>
 </objectgroup>
 <objectgroup name="Spawn" width="20" height="8">
-  <object name="mpr4" type="spawn" x="64" y="96" width="192" height="96">
+  <object name="charwdg2" type="spawn" x="128" y="128" width="128" height="64">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
  </object>
-  <object name="mpr5" type="spawn" x="256" y="96" width="192" height="128">
+  <object name="charwdg3" type="spawn" x="256" y="96" width="192" height="128">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
  </object>
-  <object name="mpr4" type="spawn" x="480" y="96" width="128" height="128"/>
+  <object name="charwdg2" type="spawn" x="480" y="96" width="128" height="128"/>
+  <object name="falothen0" type="spawn" x="64" y="160" width="32" height="32"/>
 </objectgroup>
 <objectgroup name="Keys" width="20" height="8"/>
 </map>
--- a/AndorsTrail/res/xml/minerhouse1.tmx
+++ b/AndorsTrail/res/xml/minerhouse1.tmx
@@ -1,125 +1,124 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="20" height="8" tilewidth="32" tileheight="32">
 <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="576" height="192"/>
 </tileset>
 <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="576" height="192"/>
 </tileset>
 <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="576" height="192"/>
 </tileset>
 <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="480" height="256"/>
 </tileset>
 <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="480" height="256"/>
 </tileset>
 <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="512" height="256"/>
 </tileset>
 <layer name="Ground" width="20" height="8">
  <data encoding="base64" compression="zlib">
@@ -150,14 +149,18 @@
  </object>
 </objectgroup>
 <objectgroup name="Spawn" width="20" height="8">
-  <object name="mpr4" type="spawn" x="32" y="96" width="192" height="128">
+  <object name="charwdg1" type="spawn" x="32" y="96" width="192" height="128">
+   <properties>
+    <property name="quantity" value="3"/>
+   </properties>
+  </object>
+  <object name="charwdg2" type="spawn" x="256" y="128" width="64" height="64"/>
+  <object name="charwdg2" type="spawn" x="352" y="96" width="64" height="64"/>
+  <object name="charwdg3" type="spawn" x="448" y="96" width="128" height="96">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
  </object>
-  <object name="mpr4" type="spawn" x="256" y="128" width="64" height="64"/>
-  <object name="mpr5" type="spawn" x="352" y="96" width="64" height="64"/>
-  <object name="mpr5" type="spawn" x="448" y="96" width="128" height="96"/>
 </objectgroup>
 <objectgroup name="Keys" width="20" height="8"/>
 </map>
--- a/AndorsTrail/res/xml/minerhouse2.tmx
+++ b/AndorsTrail/res/xml/minerhouse2.tmx
@@ -1,125 +1,124 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="20" height="8" tilewidth="32" tileheight="32">
 <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="576" height="192"/>
 </tileset>
 <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="576" height="192"/>
 </tileset>
 <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="576" height="192"/>
 </tileset>
 <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="480" height="256"/>
 </tileset>
 <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="480" height="256"/>
 </tileset>
 <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="512" height="256"/>
 </tileset>
 <layer name="Ground" width="20" height="8">
  <data encoding="base64" compression="zlib">
@@ -128,7 +127,7 @@
 </layer>
 <layer name="Objects" width="20" height="8">
  <data encoding="base64" compression="zlib">
-   eJyNkT1OAzEQhV+0XiHFXimKhCio6JIDAIoooeEIHIBLUNOQFgIKpKJLwRFoaRA1BQUdkGygQ4JsCt7wHO2yFSN9Go/95sf2sIFfO4l+GL3ZVVz3K3vVc7PLWmw2dcCE5OS2DYy9/A79jVc8c9KZxmpMmkA3la7guuPV1+aaU/NNCvLQ1p75C/pjJxZOOtPcp5qjl0q3nwAvTfWx+ceMD1vAcwBs/CpnThx58U7NE+us0q+QNXLA/G7lvpt2F+7vZcAG/vIRNO8sSHvaUD2zT1++aS/+gb35Fuu9tnR2zjiPNRah1L8louBenkqzm+lsGsq/GZF11tsmd9TDKWf5j4+J+IrYu1gt63WdSWO5g6S876j258t+/7F+LfcHkbpKDA==
+   eJyNkb1OAkEUhS/Z2ZgwQ0JIjIWVHTyAEmKpjY/gA/gS1jbSqhiUF6DwEWhpiLWFhZ0Ki3Ym6lJ4jmfIrlt5ky937sy5PzMzrNmvnUc/jJ52G9f90l75nHZTiWkLZzYHGZi0zMZefh/+ziteOumoYY153ayTSpdj3fbqy7m+ofkCObhvaY/+Gv7MiZWTjppZqjl6qXRHidlzXX04/xjxSdPsKZhx/DKXTpx68QbNI+pswm+ALXCM/E7pvru8C/YPG2Y79pf3oHmXQdqLmurRPnzxpr34B3zzPdR7aepsgDiLNVah0L8mIsdelkpz0NDZIhR/MwLbqNcFU+jNKWf9jw+J+IzwXXgP9spiHeZeJcV9R5U/X/f7j/UruT9n0kmu
  </data>
 </layer>
 <layer name="Above" width="20" height="8">
@@ -150,13 +149,17 @@
  </object>
 </objectgroup>
 <objectgroup name="Spawn" width="20" height="8">
-  <object name="mpr5" type="spawn" x="64" y="96" width="320" height="128">
+  <object name="charwdg2" type="spawn" x="64" y="96" width="320" height="128">
+   <properties>
+    <property name="quantity" value="3"/>
+   </properties>
+  </object>
+  <object name="charwdg2" type="spawn" x="384" y="160" width="32" height="32"/>
+  <object name="charwdg1" type="spawn" x="448" y="128" width="160" height="96">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
  </object>
-  <object name="mpr4" type="spawn" x="384" y="160" width="32" height="32"/>
-  <object name="mpr5" type="spawn" x="448" y="128" width="160" height="96"/>
 </objectgroup>
 <objectgroup name="Keys" width="20" height="8"/>
 </map>
--- a/AndorsTrail/res/xml/minerhouse3.tmx
+++ b/AndorsTrail/res/xml/minerhouse3.tmx
@@ -1,125 +1,124 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="16" height="8" tilewidth="32" tileheight="32">
 <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="576" height="192"/>
 </tileset>
 <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="576" height="192"/>
 </tileset>
 <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="576" height="192"/>
 </tileset>
 <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="480" height="256"/>
 </tileset>
 <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="480" height="256"/>
 </tileset>
 <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="512" height="256"/>
 </tileset>
 <layer name="Ground" width="16" height="8">
  <data encoding="base64" compression="zlib">
@@ -150,14 +149,14 @@
  </object>
 </objectgroup>
 <objectgroup name="Spawn" width="16" height="8">
-  <object name="mpr5" type="spawn" x="32" y="96" width="96" height="128"/>
-  <object name="mpr5" type="spawn" x="128" y="128" width="32" height="32"/>
-  <object name="scaradon_3" type="spawn" x="192" y="160" width="32" height="64">
+  <object name="charwdg1" type="spawn" x="32" y="96" width="96" height="128"/>
+  <object name="charwdg2" type="spawn" x="128" y="128" width="32" height="32"/>
+  <object name="charwdg2" type="spawn" x="192" y="160" width="32" height="64">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
  </object>
-  <object name="mpr4" type="spawn" x="224" y="96" width="224" height="128">
+  <object name="charwdg2" type="spawn" x="256" y="96" width="224" height="96">
   <properties>
    <property name="quantity" value="3"/>
   </properties>
--- a/AndorsTrail/res/xml/minerhouse4.tmx
+++ b/AndorsTrail/res/xml/minerhouse4.tmx
@@ -1,125 +1,124 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="26" height="8" tilewidth="32" tileheight="32">
 <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="576" height="192"/>
 </tileset>
 <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="576" height="192"/>
 </tileset>
 <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="576" height="192"/>
 </tileset>
 <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="480" height="256"/>
 </tileset>
 <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="480" height="256"/>
 </tileset>
 <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="512" height="256"/>
 </tileset>
 <layer name="Ground" width="26" height="8">
  <data encoding="base64" compression="zlib">
@@ -128,7 +127,7 @@
 </layer>
 <layer name="Objects" width="26" height="8">
  <data encoding="base64" compression="zlib">
-   eJxlUktKA0EQrWEMJJkZDG783MAD6A0UdGMUFOLOQ+gB3NkuFWFGr+LWnWtB41qME12JKCT6HlVtj+2DR337VXfNiIiUifziquGfmO/Mnid/e329jCxRRTn2XoKvpnE9p5bxc1dj4i3RXt/DGs+NGznWnZ1lXJnvrGetEJnCHoO3pjs1XcansN/W6yzXnhHpgBO7L3Mb0Nk0LcbcDX3/tl3U9gqdtw7epcp78AEcgo9p2MkH/AXMWASHLZFeJnKAcwNwH9wBtxux/x7U72Rh3hlyL7nm+Aav+ZUqb8AR59ocYj7X3r7N+eyG+S56j98/7RN0xuAF/DrX3Cp0V8BZcAlcButWuDd7e1n49m2bU5nmVvH/v+FuJuC77YvvO7S+Ua6aRG0arB9ZvbnDfhH+S48yimPwftwH4TVjxJoeP+4TXBA=
+   eJxlUktKA0EQrWEMJJkZDG783MAD6A0UdGMUFOLOQ+gB3NluRZjRlfdw6861oHEtxomuRBQSfY+qtsf2waO+/aq7ZkREykR+cdnwT8x3Zs+Sv72+XkaWqKIcey/AV9O4nlPL+LmrMfGWaK/vYY3nxo0c687OMq7Md9azVohMYY/BW9Odmi7jU9hv63WWa8+IdMCJ3Ze5DehsmhZj7oa+f9suanuFzlsH71LlPfgADsHHNOzkA/4CZiyCw5ZILxM5wLkBuA/ugNuN2H8P6neyMO8KfMk1xzd4za9UeQOOONfmEPO59vZtzmc3zHfRe/z+aZ+gMwbP4de55lahuwLOgkvgMli3wr3Z28vCt2/bnMo0t4r//w13MwHfbV9836H1jXLVJGrTYP3I6s0d9ovwX3qUURyD9+M+CK8ZI9b0+AEX2lwr
  </data>
 </layer>
 <layer name="Above" width="26" height="8">
@@ -148,10 +147,25 @@
    <property name="place" value="minerhouse4"/>
   </properties>
  </object>
+  <object name="morenavia" type="sign" x="160" y="128" width="32" height="32"/>
 </objectgroup>
 <objectgroup name="Spawn" width="26" height="8">
-  <object name="entordas" type="spawn" x="160" y="128" width="32" height="32"/>
-  <object name="yandar" type="spawn" x="320" y="160" width="32" height="32"/>
+  <object name="ccentip" type="spawn" x="192" y="128" width="64" height="32">
+   <properties>
+    <property name="quantity" value="2"/>
+   </properties>
+  </object>
+  <object name="ccentip" type="spawn" x="256" y="128" width="96" height="96">
+   <properties>
+    <property name="quantity" value="2"/>
+   </properties>
+  </object>
+  <object name="ccentip" type="spawn" x="512" y="192" width="96" height="32"/>
+  <object name="ccentip" type="spawn" x="544" y="96" width="224" height="96">
+   <properties>
+    <property name="quantity" value="2"/>
+   </properties>
+  </object>
 </objectgroup>
 <objectgroup name="Keys" width="26" height="8"/>
 </map>
--- a/AndorsTrail/res/xml/minerhouse5.tmx
+++ b/AndorsTrail/res/xml/minerhouse5.tmx
@@ -1,125 +1,124 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="16" height="8" tilewidth="32" tileheight="32">
 <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="576" height="192"/>
 </tileset>
 <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="576" height="192"/>
 </tileset>
 <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="576" height="192"/>
 </tileset>
 <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="480" height="256"/>
 </tileset>
 <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="480" height="256"/>
 </tileset>
 <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="512" height="256"/>
 </tileset>
 <layer name="Ground" width="16" height="8">
  <data encoding="base64" compression="zlib">
@@ -128,7 +127,7 @@
 </layer>
 <layer name="Objects" width="16" height="8">
  <data encoding="base64" compression="zlib">
-   eJxlUTsKwlAQXEnSaBSxsbCytbATRY+g1/EGNiatKIm5gIfwBJLawt4/2grxN+tuzBMXhpk3md235AU5+lQIHqsOwHPAM7xQmb0oJ5mJkd/miZYVoit0wyHqFcRnj2dcdCafE2QPtviMEbQPjvHtBe464kfqrXB+6j6xzpvpDp890M+rpFiXM72wiDbobyGzg18CtwGy6Vv8rU4ZeH6q+U7ur9ly18MVb1iUnTl7hNfHPSflAVCFbhbkv53QP9Uc194SeLo/5zvlf/CsO3rO2pe4svfNEphvZr4VV2RoX/XF/c1zvQGItD3d
+   eJxlUbsOAVEQHdndhl3ZaBQqrUInhE/gd/yBxmqFWFvpfIQvkK0Veu/QStbrjBn2iklO5tyzZ+ae7J1k6F0hel/5BH0KBIYWamctyohnaPg3WaJFgegCXnGIWjnRWeMdZ93J5wTevS06owc+QI/x7YnedESPVFvi/NA8se4ba4Z3DsxzlA9WfsrnFtEa8zV4ttDz6HWAbPoWfytTipmXcr6T50u23HV3Ret6kpmzHKC1cc9Rewcogldz8t+OmB+pj2tnCQLNz/6G/w/edcPMSecSV3JfLYH5ZuZbcUUGHyg/u79+rheqxD4C
  </data>
 </layer>
 <layer name="Above" width="16" height="8">
@@ -148,12 +147,21 @@
    <property name="place" value="minerhouse5"/>
   </properties>
  </object>
+  <object name="ayell" type="sign" x="160" y="128" width="32" height="32"/>
 </objectgroup>
 <objectgroup name="Spawn" width="16" height="8">
-  <object name="mpr6" type="spawn" x="32" y="96" width="128" height="128"/>
-  <object name="mpr7" type="spawn" x="160" y="128" width="32" height="32"/>
-  <object name="mpr7" type="spawn" x="192" y="96" width="96" height="128"/>
-  <object name="mpr6" type="spawn" x="320" y="128" width="160" height="96"/>
+  <object name="ccentip" type="spawn" x="32" y="96" width="128" height="96">
+   <properties>
+    <property name="quantity" value="2"/>
+   </properties>
+  </object>
+  <object name="ccentip" type="spawn" x="192" y="96" width="96" height="128"/>
+  <object name="ccentip" type="spawn" x="320" y="128" width="160" height="64">
+   <properties>
+    <property name="quantity" value="2"/>
+   </properties>
+  </object>
+  <object name="ccentip" type="spawn" x="288" y="192" width="32" height="32"/>
 </objectgroup>
 <objectgroup name="Keys" width="16" height="8"/>
 </map>
--- a/AndorsTrail/res/xml/minerhouse6.tmx
+++ b/AndorsTrail/res/xml/minerhouse6.tmx
@@ -1,125 +1,124 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="12" height="8" tilewidth="32" tileheight="32">
 <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="576" height="192"/>
 </tileset>
 <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="576" height="192"/>
 </tileset>
 <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="576" height="192"/>
 </tileset>
 <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="480" height="256"/>
 </tileset>
 <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="480" height="256"/>
 </tileset>
 <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="512" height="256"/>
 </tileset>
 <layer name="Ground" width="12" height="8">
  <data encoding="base64" compression="zlib">
@@ -150,8 +149,11 @@
  </object>
 </objectgroup>
 <objectgroup name="Spawn" width="12" height="8">
-  <object name="mpr8" type="spawn" x="64" y="96" width="256" height="128"/>
-  <object name="mpr7" type="spawn" x="32" y="96" width="288" height="128"/>
+  <object name="charwdg3" type="spawn" x="64" y="96" width="256" height="96">
+   <properties>
+    <property name="quantity" value="3"/>
+   </properties>
+  </object>
 </objectgroup>
 <objectgroup name="Keys" width="12" height="8"/>
 </map>
--- a/AndorsTrail/res/xml/minerhouse7.tmx
+++ b/AndorsTrail/res/xml/minerhouse7.tmx
@@ -1,125 +1,124 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="16" height="8" tilewidth="32" tileheight="32">
 <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="576" height="192"/>
 </tileset>
 <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="576" height="192"/>
 </tileset>
 <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="576" height="192"/>
 </tileset>
 <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="480" height="256"/>
 </tileset>
 <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="480" height="256"/>
 </tileset>
 <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="512" height="256"/>
 </tileset>
 <layer name="Ground" width="16" height="8">
  <data encoding="base64" compression="zlib">
@@ -150,16 +149,17 @@
  </object>
 </objectgroup>
 <objectgroup name="Spawn" width="16" height="8">
-  <object name="mpr7" type="spawn" x="32" y="96" width="256" height="128">
+  <object name="charwdg2" type="spawn" x="128" y="128" width="192" height="64">
   <properties>
    <property name="quantity" value="3"/>
   </properties>
  </object>
-  <object name="mpr8" type="spawn" x="320" y="96" width="160" height="128">
+  <object name="charwdg2" type="spawn" x="320" y="96" width="160" height="128">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
  </object>
+  <object name="fayvara0" type="spawn" x="32" y="160" width="32" height="32"/>
 </objectgroup>
 <objectgroup name="Keys" width="16" height="8"/>
 </map>
--- a/AndorsTrail/res/xml/minerhouse8.tmx
+++ b/AndorsTrail/res/xml/minerhouse8.tmx
@@ -1,125 +1,124 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="16" height="8" tilewidth="32" tileheight="32">
 <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="576" height="192"/>
 </tileset>
 <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="576" height="192"/>
 </tileset>
 <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="576" height="192"/>
 </tileset>
 <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="480" height="256"/>
 </tileset>
 <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="480" height="256"/>
 </tileset>
 <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="512" height="256"/>
 </tileset>
 <layer name="Ground" width="16" height="8">
  <data encoding="base64" compression="zlib">
@@ -150,10 +149,15 @@
  </object>
 </objectgroup>
 <objectgroup name="Spawn" width="16" height="8">
-  <object name="mpr8" type="spawn" x="64" y="128" width="96" height="96"/>
-  <object name="mpr7" type="spawn" x="224" y="160" width="32" height="32"/>
-  <object name="mpr8" type="spawn" x="288" y="128" width="64" height="64"/>
-  <object name="mpr7" type="spawn" x="384" y="96" width="96" height="128"/>
+  <object name="charwdg3" type="spawn" x="64" y="128" width="96" height="64"/>
+  <object name="charwdg1" type="spawn" x="224" y="160" width="32" height="32"/>
+  <object name="charwdg2" type="spawn" x="288" y="128" width="64" height="64"/>
+  <object name="charwdg3" type="spawn" x="384" y="96" width="96" height="128">
+   <properties>
+    <property name="quantity" value="2"/>
+   </properties>
+  </object>
+  <object name="charwdg1" type="spawn" x="192" y="192" width="32" height="32"/>
 </objectgroup>
 <objectgroup name="Keys" width="16" height="8"/>
 </map>
--- a/AndorsTrail/res/xml/minerhouse9.tmx
+++ b/AndorsTrail/res/xml/minerhouse9.tmx
@@ -1,125 +1,124 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="12" height="8" tilewidth="32" tileheight="32">
 <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="576" height="192"/>
 </tileset>
 <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="576" height="192"/>
 </tileset>
 <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="576" height="192"/>
 </tileset>
 <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="480" height="256"/>
 </tileset>
 <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="480" height="256"/>
 </tileset>
 <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="512" height="256"/>
 </tileset>
 <layer name="Ground" width="12" height="8">
  <data encoding="base64" compression="zlib">
@@ -150,9 +149,13 @@
  </object>
 </objectgroup>
 <objectgroup name="Spawn" width="12" height="8">
-  <object name="mpr8" type="spawn" x="64" y="96" width="64" height="64"/>
-  <object name="mpr7" type="spawn" x="160" y="128" width="96" height="96"/>
-  <object name="mpr8" type="spawn" x="256" y="96" width="96" height="128"/>
+  <object name="charwdg2" type="spawn" x="64" y="96" width="64" height="64"/>
+  <object name="charwdg1" type="spawn" x="160" y="128" width="96" height="64">
+   <properties>
+    <property name="quantity" value="2"/>
+   </properties>
+  </object>
+  <object name="charwdg2" type="spawn" x="256" y="96" width="96" height="128"/>
 </objectgroup>
 <objectgroup name="Keys" width="12" height="8"/>
 </map>
--- a/AndorsTrail/res/xml/oldcave0.tmx
+++ b/AndorsTrail/res/xml/oldcave0.tmx
@@ -1,125 +1,124 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="20" height="20" tilewidth="32" tileheight="32">
 <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="576" height="192"/>
 </tileset>
 <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="576" height="192"/>
 </tileset>
 <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="576" height="192"/>
 </tileset>
 <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="480" height="256"/>
 </tileset>
 <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="480" height="256"/>
 </tileset>
 <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="512" height="256"/>
 </tileset>
 <layer name="Ground" width="20" height="20">
  <data encoding="base64" compression="zlib">
@@ -156,33 +155,27 @@
  </object>
 </objectgroup>
 <objectgroup name="Spawn" width="20" height="20">
-  <object name="hadar_2" type="spawn" x="288" y="128" width="288" height="128">
+  <object name="zombie2" type="spawn" x="64" y="192" width="32" height="192">
   <properties>
    <property name="quantity" value="3"/>
   </properties>
  </object>
-  <object name="morphrang_2" type="spawn" x="256" y="128" width="320" height="128"/>
-  <object name="hadar_1" type="spawn" x="224" y="96" width="32" height="64">
+  <object name="zombie2" type="spawn" x="32" y="384" width="64" height="224">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
  </object>
-  <object name="morphrang_1" type="spawn" x="160" y="96" width="32" height="64">
+  <object name="zombie3" type="spawn" x="128" y="576" width="64" height="32"/>
+  <object name="zombie2" type="spawn" x="224" y="576" width="64" height="32"/>
+  <object name="zombie3" type="spawn" x="288" y="384" width="224" height="192">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
  </object>
-  <object name="morphrang_2" type="spawn" x="64" y="192" width="32" height="32"/>
-  <object name="hadar_2" type="spawn" x="64" y="256" width="32" height="128"/>
-  <object name="hadar_1" type="spawn" x="32" y="384" width="64" height="224">
-   <properties>
-    <property name="quantity" value="2"/>
-   </properties>
-  </object>
-  <object name="morphrang_2" type="spawn" x="128" y="576" width="64" height="32"/>
-  <object name="hadar_2" type="spawn" x="224" y="576" width="96" height="32"/>
-  <object name="morphrang_3" type="spawn" x="320" y="384" width="288" height="192"/>
-  <object name="morphrang_2" type="spawn" x="288" y="384" width="320" height="192">
+  <object name="zombie2" type="spawn" x="416" y="160" width="96" height="96"/>
+  <object name="zombie2" type="spawn" x="512" y="192" width="64" height="64"/>
+  <object name="zombie2" type="spawn" x="256" y="128" width="160" height="96"/>
+  <object name="zombie2" type="spawn" x="192" y="128" width="32" height="64">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
--- a/AndorsTrail/res/xml/oldcave1.tmx
+++ b/AndorsTrail/res/xml/oldcave1.tmx
@@ -1,125 +1,124 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="20" height="25" tilewidth="32" tileheight="32">
 <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="576" height="192"/>
 </tileset>
 <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="576" height="192"/>
 </tileset>
 <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="576" height="192"/>
 </tileset>
 <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="480" height="256"/>
 </tileset>
 <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="480" height="256"/>
 </tileset>
 <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="512" height="256"/>
 </tileset>
 <layer name="Ground" width="20" height="25">
  <data encoding="base64" compression="zlib">
@@ -149,47 +148,53 @@
   </properties>
  </object>
 </objectgroup>
- <objectgroup name="Spawn" width="20" height="25" visible="0">
-  <object name="hadar_3" type="spawn" x="32" y="128" width="288" height="160">
+ <objectgroup name="Spawn" width="20" height="25">
+  <object name="zombie3" type="spawn" x="32" y="160" width="128" height="128"/>
+  <object name="zombie3" type="spawn" x="352" y="160" width="192" height="32">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
  </object>
-  <object name="morphrang_3" type="spawn" x="352" y="160" width="192" height="32">
+  <object name="zombie2" type="spawn" x="544" y="160" width="32" height="64">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
  </object>
-  <object name="hadar_2" type="spawn" x="544" y="192" width="64" height="32">
+  <object name="zombie3" type="spawn" x="576" y="256" width="32" height="128">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
  </object>
-  <object name="hadar_3" type="spawn" x="576" y="256" width="32" height="160"/>
-  <object name="morphrang_3" type="spawn" x="320" y="384" width="256" height="96">
+  <object name="zombie4" type="spawn" x="320" y="384" width="256" height="96">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
  </object>
-  <object name="hadar_3" type="spawn" x="256" y="480" width="32" height="32"/>
-  <object name="hadar_2" type="spawn" x="160" y="448" width="32" height="64">
+  <object name="zombie3" type="spawn" x="256" y="480" width="32" height="32"/>
+  <object name="zombie4" type="spawn" x="96" y="448" width="32" height="64">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
  </object>
-  <object name="morphrang_3" type="spawn" x="32" y="512" width="32" height="160"/>
-  <object name="hadar_3" type="spawn" x="64" y="672" width="128" height="96"/>
-  <object name="morphrang_3" type="spawn" x="64" y="640" width="288" height="128">
+  <object name="zombie4" type="spawn" x="32" y="512" width="32" height="160">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
  </object>
-  <object name="hadar_4" type="spawn" x="512" y="576" width="96" height="128">
+  <object name="zombie3" type="spawn" x="64" y="672" width="128" height="96"/>
+  <object name="zombie2" type="spawn" x="192" y="672" width="128" height="64">
   <properties>
-    <property name="respawn" value="false"/>
+    <property name="quantity" value="2"/>
   </properties>
  </object>
-  <object name="hadar_3" type="spawn" x="320" y="608" width="192" height="128">
+  <object name="oldcaveboss" type="spawn" x="512" y="576" width="96" height="128"/>
+  <object name="zombie4" type="spawn" x="320" y="608" width="192" height="128">
+   <properties>
+    <property name="quantity" value="2"/>
+   </properties>
+  </object>
+  <object name="zombie3" type="spawn" x="192" y="480" width="32" height="32"/>
+  <object name="zombie2" type="spawn" x="160" y="128" width="160" height="160">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
--- a/AndorsTrail/res/xml/road1.tmx
+++ b/AndorsTrail/res/xml/road1.tmx
@@ -1,137 +1,136 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="25" height="25" tilewidth="32" tileheight="32">
 <properties>
  <property name="outside" value="1"/>
 </properties>
 <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="576" height="192"/>
 </tileset>
 <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="576" height="192"/>
 </tileset>
 <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="576" height="192"/>
 </tileset>
 <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="480" height="256"/>
 </tileset>
 <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="480" height="256"/>
 </tileset>
 <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="512" height="256"/>
 </tileset>
 <layer name="Ground" width="25" height="25">
  <data encoding="base64" compression="zlib">
-   eJztlFsKgCAQRaWoP0FX34oiNxDuoAW4gigK3zo+EAo/DuIDjnccFAShgSK0zjrbg7p2nRNEzgWRa+po7rv2Qp4bnIZ6B6hjx2modbDu6/EwKollYI7aQRycSmIZOLXfDprFlcmF2S8p9TIzLZOe7+UY/X2Z4qnFXxw5ntAb1/DEehXqgfhycvg8rfrhy67QH1fL1eJvKOmbTqeEExkk6bU=
+   eJztlFkKgCAQhqWot0BP34mi5T2qC3QAT5C20FQuY0pQ9PAhLvDNr4OcEhIxQor0SLkC1+Q5Tvc5p/saHM/7qj2TZyZzA9aAdbSZG/AeLvVqPJU4WwsaZs9QKe4O4+jEuV4wMHuGjl3fDpvlnElFA2o2vbvNsWXKk2WEyJxjrO9LF08ovuK44zG9cQiPrVexHozvTg6d56l+eLPL9MeFcj3xN/j0zc+PDxO3zOnK
  </data>
 </layer>
 <layer name="Objects" width="25" height="25">
  <data encoding="base64" compression="zlib">
-   eJylVT1PAkEQnYtI4+HtoYUmVlb6U+BotETRisSQECs7tTUx/kIarAXBShMSwB3Y4WaH2QPjJBN219335s3HCeDbIAa4Mvn+2a6fcJ/mZ1EK/7ZXi3nPeK5pnfr41f2/Y+P7Xrxca1oeKv790y05FnGx2EaOI6SFYuhXAd6rm/Hx3mFF/1vT6FpOSsv92L792oID7/Vj/4zy3TK+FtRHWo4sz7H1M+ufEcBNAvCym2vjGr93wMsT14A2DfWYs3PLMY3yPfKhNlWj6MuM4YTqcpesx1U7WNdJNonB68vM5Pt24mtBjo71uvBbk/cD2c8eQFxav4veYOtuoPY4qxdlgMstHG3Fn+ozLPNFPLJf6P1InM8NhM29wdprPI/OkW8i+ZiNjc8ztesZ23+wt5JH8q16LvVnG/ElzywQU0/RU8jl+Ahf8miauJ4355t0YVyEj1gSc8D08HzjLLQTn6+IS4tf9rm01YyyHizi4nkaK7khbbxPW+JOtIErhB+qBfVZU/xvHIpvBeeS9SbsocMK9VjmZp3j8m9M1+RcvN5F88h1Yf2pJjifHYaJ1hO9MlfyxjEHAR0NEa9mlAM5H6RL6y1+linYoVmT86Hp4v1AsWVMr4bB30pOTRf+1uw3uu48Ky856KwoNvz9BcG+1hs=
+   eJylVT1PAkEQnYtI4yF7aKGJlZX+FDgaLVG0IjEkxMpObU2Mv5AGa0Gw0oQEcEd22Nlx9sA4yYTddfe9efNxAoQ2TAEujN8/2vUD7jN/lmTwb3u2mLeM55LWWYhf2/07Nr7vp8u1puWuEt4/3pDjJy4W29hxxLRQDIMawGttPT7e26/of2sZXctRabmf2LcfG3DgvUEanlG+2ybUgvpIy4HlObR+Yv09AbiqAjxte21c4+cWBHniGtBmsR5zdmo5ZonfIx9qUzWKvswZTqwuNzb2DjvHuOp7v3WSTVMI+jI3ft+phlqQo2u9Ifza+H4g+9oBSEu/76I32boXqT3O6lkZ4HwDR1vxZ/oMy3wRj+wXej8W5wsDcXNvsPYaz71z5JtKPmYTE/LM7HrO9m/sreSRfKuey8LZRnzJM4/E1Ff0FHI5PsKXPJomrufF+TpdGBfhI5bEHDI9PN84C9jTnK+IS4tf9rm01YyyHizi4nmaKLkhbbxP2+JOsoYrhh+rBfVZS/xvHIlvBeeS9SbskcOK9VjuZp3j8m9Mz3guXu+ieeS6sP5UE5zPLsNE64teWSh545jDiI6miFczyoGcD9Kl9RY/yxXs2KzJ+dB08X6g2HKmV8PgbyWnpgt/6/Yb3XCel5ccdFYUG/5+A90X1pA=
  </data>
 </layer>
 <layer name="Above" width="25" height="25">
@@ -139,7 +138,7 @@
   eJzFUssKgzAQ3IOG9iCIYH/KD+gf9O/rC/TcBg2EJY/ZJOJcxGQzszO7RAeWlkSY//Vr477TXLOHD9HZalkvKehV3ntpXoin/ayxs0N0HhXRs8I8vZR/NqXwdvBL87IxdcfX+NT4BPi0vxy9O5HbO39v/seL8uK7ZOt8I7op/C6dK8F1SnhCdO6GdCd0/65skLxSdw/h5vuD+kqZszSvktoxndJ7a+bNdaQwfUn6Q97YNRy+89hdDmK8Ie+DCnP8AFYjUkA=
  </data>
 </layer>
- <layer name="Walkable" width="25" height="25">
+ <layer name="Walkable" width="25" height="25" visible="0">
  <data encoding="base64" compression="zlib">
   eJzdlNENACEIQx3Bpdh/JR1AoJRqLteED3OhT6qnzTFsVyabmvoKp8tC9Ze8XpzHiRWxT99YZX7ZmmWqPCr5M3c46kfy78wazXM7wxtSnw/LUUjxn1cZXl6eF8Lp3C+0x3u7UHXmYLxQBjtPlaHab8TIepA9KqrivwCmO1n8
  </data>
--- a/AndorsTrail/res/xml/roadbeforecrossroads1.tmx
+++ b/AndorsTrail/res/xml/roadbeforecrossroads1.tmx
@@ -140,7 +140,7 @@
 </layer>
 <layer name="Walkable" width="29" height="25">
  <data encoding="base64" compression="zlib">
-   eJy9k9sNgDAIRTuCS3X/lYx/DeFxKCCJMVIvByjsZ609+Hw2Gd9iSu5kHhrv9MtzzTIcT2eZdp7hUZ9npD/nW/qtb49HuCRORUf7a2koi+RNZkTbG8KXu0A1tzVbMSmjs9cV5s0enZw/ud6cdfOiPG5rndrnaHemuZGum0m1WcveYddcV+vMzFjHfWr/kdopl851xK3sasU6WZn7eQHtbnyE
+   eJy1lNsJwDAIADNCl8r+K4X+BfFxRhVKqamez+xvrT34/DLp32JK7mQcGu/Wy3NNMhzPzhLtPMOjOk9Ife631FvfHo9wiZ+KHa2vZUNZJG4yI9reEL7cBWrzmrPlkzIqtc7WsYt95xjdPxNcb866eVEcr7lO7XO0O9PcyK6bSW2zku1h11xX88zMWEc/tf9I7pRL5zriVna1Ip2sTH8O9Mh82Q==
  </data>
 </layer>
 <objectgroup name="Mapevents" width="29" height="25">
@@ -178,12 +178,18 @@
 </objectgroup>
 <objectgroup name="Spawn" width="29" height="25">
  <object name="fox2" type="spawn" x="192" y="96" width="160" height="64"/>
-  <object name="forestsnail1" type="spawn" x="160" y="448" width="192" height="288">
+  <object name="jelly1" type="spawn" x="160" y="448" width="192" height="288">
+   <properties>
+    <property name="quantity" value="3"/>
+   </properties>
+  </object>
+  <object name="forestserpent1" type="spawn" x="512" y="608" width="160" height="128">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
  </object>
-  <object name="forestserpent1" type="spawn" x="512" y="608" width="160" height="160"/>
+  <object name="forestfly1" type="spawn" x="768" y="128" width="128" height="192"/>
+  <object name="forestwolf2" type="spawn" x="640" y="384" width="128" height="96"/>
 </objectgroup>
 <objectgroup name="Keys" width="29" height="25"/>
 </map>
--- a/AndorsTrail/res/xml/roadbeforecrossroads2.tmx
+++ b/AndorsTrail/res/xml/roadbeforecrossroads2.tmx
@@ -1,128 +1,127 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="29" height="30" tilewidth="32" tileheight="32">
 <properties>
  <property name="outside" value="1"/>
 </properties>
 <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="576" height="192"/>
 </tileset>
 <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="576" height="192"/>
 </tileset>
 <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="576" height="192"/>
 </tileset>
 <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="480" height="256"/>
 </tileset>
 <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="480" height="256"/>
 </tileset>
 <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="512" height="256"/>
 </tileset>
 <layer name="Ground" width="29" height="30">
  <data encoding="base64" compression="zlib">
@@ -169,37 +168,33 @@
    <property name="place" value="east"/>
   </properties>
  </object>
+  <object name="sign_rbfcr2" type="sign" x="672" y="672" width="32" height="32"/>
 </objectgroup>
 <objectgroup name="Spawn" width="29" height="30">
-  <object name="forestwolf1" type="spawn" x="288" y="32" width="256" height="160">
+  <object name="forestwolf1" type="spawn" x="288" y="64" width="224" height="160">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
  </object>
-  <object name="forestfly1" type="spawn" x="96" y="128" width="192" height="128"/>
-  <object name="forestboar2" type="spawn" x="384" y="256" width="64" height="32">
-   <properties>
-    <property name="quantity" value="2"/>
-   </properties>
-  </object>
-  <object name="beetle2" type="spawn" x="288" y="352" width="128" height="96"/>
-  <object name="forestfly2" type="spawn" x="32" y="384" width="224" height="160">
+  <object name="forestfox2" type="spawn" x="96" y="128" width="192" height="128"/>
+  <object name="fox2" type="spawn" x="384" y="256" width="64" height="32">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
  </object>
+  <object name="forestwolf1" type="spawn" x="288" y="352" width="128" height="96"/>
  <object name="fox2" type="spawn" x="256" y="448" width="192" height="288">
   <properties>
    <property name="quantity" value="3"/>
   </properties>
  </object>
  <object name="forestserpent1" type="spawn" x="256" y="832" width="64" height="32"/>
-  <object name="beetle2" type="spawn" x="32" y="800" width="224" height="128">
+  <object name="forestwolf1" type="spawn" x="64" y="800" width="192" height="128">
   <properties>
    <property name="quantity" value="3"/>
   </properties>
  </object>
-  <object name="pack1" type="spawn" x="480" y="352" width="160" height="192">
+  <object name="fox2" type="spawn" x="480" y="352" width="160" height="192">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
@@ -209,6 +204,12 @@
    <property name="quantity" value="2"/>
   </properties>
  </object>
+  <object name="fox2" type="spawn" x="544" y="160" width="160" height="64"/>
+  <object name="forestfox2" type="spawn" x="32" y="384" width="224" height="160">
+   <properties>
+    <property name="quantity" value="2"/>
+   </properties>
+  </object>
 </objectgroup>
 <objectgroup name="Keys" width="29" height="30"/>
 </map>
--- a/AndorsTrail/res/xml/roadbeforecrossroads3.tmx
+++ b/AndorsTrail/res/xml/roadbeforecrossroads3.tmx
@@ -1,128 +1,127 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="30" height="15" tilewidth="32" tileheight="32">
 <properties>
  <property name="outside" value="1"/>
 </properties>
 <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="576" height="192"/>
 </tileset>
 <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="576" height="192"/>
 </tileset>
 <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="576" height="192"/>
 </tileset>
 <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="480" height="256"/>
 </tileset>
 <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="480" height="256"/>
 </tileset>
 <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="512" height="256"/>
 </tileset>
 <layer name="Ground" width="30" height="15">
  <data encoding="base64" compression="zlib">
@@ -159,9 +158,9 @@
  </object>
 </objectgroup>
 <objectgroup name="Spawn" width="30" height="15">
-  <object name="forestfly3" type="spawn" x="704" y="128" width="224" height="160">
+  <object name="forestboar3" type="spawn" x="704" y="128" width="224" height="160">
   <properties>
-    <property name="quantity" value="3"/>
+    <property name="quantity" value="2"/>
   </properties>
  </object>
  <object name="fox2" type="spawn" x="256" y="64" width="288" height="96">
@@ -169,7 +168,7 @@
    <property name="quantity" value="2"/>
   </properties>
  </object>
-  <object name="krommas" type="spawn" x="96" y="256" width="608" height="128"/>
+  <object name="highwayman1" type="spawn" x="96" y="256" width="608" height="128"/>
 </objectgroup>
 <objectgroup name="Keys" width="30" height="15" visible="0"/>
 </map>
--- a/AndorsTrail/res/xml/roadbeforecrossroads4.tmx
+++ b/AndorsTrail/res/xml/roadbeforecrossroads4.tmx
@@ -1,128 +1,127 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="20" height="20" tilewidth="32" tileheight="32">
 <properties>
  <property name="outside" value="1"/>
 </properties>
 <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="576" height="192"/>
 </tileset>
 <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="576" height="192"/>
 </tileset>
 <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="576" height="192"/>
 </tileset>
 <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="480" height="256"/>
 </tileset>
 <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="480" height="256"/>
 </tileset>
 <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="512" height="256"/>
 </tileset>
 <layer name="Ground" width="20" height="20">
  <data encoding="base64" compression="zlib">
@@ -169,7 +168,7 @@
    <property name="quantity" value="3"/>
   </properties>
  </object>
-  <object name="forestfly2" type="spawn" x="416" y="224" width="160" height="224">
+  <object name="forestserpent2" type="spawn" x="416" y="224" width="160" height="224">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
--- a/AndorsTrail/res/xml/roadbeforecrossroads5.tmx
+++ b/AndorsTrail/res/xml/roadbeforecrossroads5.tmx
@@ -1,128 +1,127 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="20" height="22" tilewidth="32" tileheight="32">
 <properties>
  <property name="outside" value="1"/>
 </properties>
 <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="576" height="192"/>
 </tileset>
 <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="576" height="192"/>
 </tileset>
 <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="576" height="192"/>
 </tileset>
 <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="480" height="256"/>
 </tileset>
 <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="480" height="256"/>
 </tileset>
 <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="512" height="256"/>
 </tileset>
 <layer name="Ground" width="20" height="22">
  <data encoding="base64" compression="zlib">
@@ -159,7 +158,7 @@
  </object>
 </objectgroup>
 <objectgroup name="Spawn" width="20" height="22">
-  <object name="forestfly3" type="spawn" x="96" y="224" width="192" height="192">
+  <object name="forestboar3" type="spawn" x="96" y="224" width="192" height="192">
   <properties>
    <property name="quantity" value="3"/>
   </properties>
@@ -169,8 +168,8 @@
    <property name="quantity" value="2"/>
   </properties>
  </object>
-  <object name="pack1" type="spawn" x="512" y="352" width="96" height="96"/>
-  <object name="fox2" type="spawn" x="352" y="544" width="64" height="96"/>
+  <object name="forestserpent2" type="spawn" x="512" y="352" width="96" height="96"/>
+  <object name="forestboar2" type="spawn" x="352" y="544" width="64" height="96"/>
 </objectgroup>
 <objectgroup name="Keys" width="20" height="22" visible="0"/>
 </map>
--- a/AndorsTrail/res/xml/roadbeforecrossroads6.tmx
+++ b/AndorsTrail/res/xml/roadbeforecrossroads6.tmx
@@ -1,128 +1,127 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="20" height="30" tilewidth="32" tileheight="32">
 <properties>
  <property name="outside" value="1"/>
 </properties>
 <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="576" height="192"/>
 </tileset>
 <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="576" height="192"/>
 </tileset>
 <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="576" height="192"/>
 </tileset>
 <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="480" height="256"/>
 </tileset>
 <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="480" height="256"/>
 </tileset>
 <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="512" height="256"/>
 </tileset>
 <layer name="Ground" width="20" height="30">
  <data encoding="base64" compression="zlib">
@@ -163,26 +162,29 @@
    <property name="place" value="west"/>
   </properties>
  </object>
+  <object name="sign_rbfcr6" type="sign" x="480" y="704" width="32" height="32"/>
+  <object name="sign_rbfcr6_grave1" type="sign" x="256" y="288" width="32" height="32"/>
 </objectgroup>
 <objectgroup name="Spawn" width="20" height="30">
-  <object name="beetle2" type="spawn" x="192" y="224" width="192" height="192">
-   <properties>
-    <property name="quantity" value="3"/>
-   </properties>
-  </object>
-  <object name="forestserpent2" type="spawn" x="352" y="224" width="256" height="256">
+  <object name="forestserpent2" type="spawn" x="352" y="256" width="128" height="288">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
  </object>
-  <object name="forestboar3" type="spawn" x="384" y="480" width="160" height="192">
+  <object name="forestfox2" type="spawn" x="384" y="480" width="160" height="192">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
  </object>
-  <object name="forestfly3" type="spawn" x="32" y="352" width="160" height="96"/>
+  <object name="forestboar3" type="spawn" x="64" y="352" width="160" height="96"/>
  <object name="fox2" type="spawn" x="96" y="736" width="192" height="128"/>
-  <object name="esgam" type="spawn" x="128" y="128" width="32" height="32"/>
+  <object name="agthor" type="spawn" x="128" y="128" width="32" height="32"/>
+  <object name="forestfox2" type="spawn" x="416" y="256" width="160" height="128">
+   <properties>
+    <property name="quantity" value="2"/>
+   </properties>
+  </object>
+  <object name="agthor_guard" type="spawn" x="224" y="128" width="32" height="32"/>
 </objectgroup>
 <objectgroup name="Keys" width="20" height="30" visible="0"/>
 </map>
--- a/AndorsTrail/res/xml/roadbeforecrossroads7.tmx
+++ b/AndorsTrail/res/xml/roadbeforecrossroads7.tmx
@@ -1,128 +1,127 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="20" height="20" tilewidth="32" tileheight="32">
 <properties>
  <property name="outside" value="1"/>
 </properties>
 <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="576" height="192"/>
 </tileset>
 <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="576" height="192"/>
 </tileset>
 <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="576" height="192"/>
 </tileset>
 <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="480" height="256"/>
 </tileset>
 <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="480" height="256"/>
 </tileset>
 <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="512" height="256"/>
 </tileset>
 <layer name="Ground" width="20" height="20">
  <data encoding="base64" compression="zlib">
@@ -164,8 +163,8 @@
    <property name="quantity" value="2"/>
   </properties>
  </object>
-  <object name="forestwolf1" type="spawn" x="352" y="64" width="128" height="64"/>
-  <object name="forestfly3" type="spawn" x="448" y="128" width="160" height="192">
+  <object name="forestboar3" type="spawn" x="352" y="64" width="128" height="64"/>
+  <object name="beetle2" type="spawn" x="448" y="128" width="160" height="192">
   <properties>
    <property name="quantity" value="3"/>
   </properties>
--- a/AndorsTrail/res/xml/roadbeforecrossroads8.tmx
+++ b/AndorsTrail/res/xml/roadbeforecrossroads8.tmx
@@ -1,128 +1,127 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="20" height="27" tilewidth="32" tileheight="32">
 <properties>
  <property name="outside" value="1"/>
 </properties>
 <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="576" height="192"/>
 </tileset>
 <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="576" height="192"/>
 </tileset>
 <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="576" height="192"/>
 </tileset>
 <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="480" height="256"/>
 </tileset>
 <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="480" height="256"/>
 </tileset>
 <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="512" height="256"/>
 </tileset>
 <layer name="Ground" width="20" height="27">
  <data encoding="base64" compression="zlib">
@@ -131,12 +130,12 @@
 </layer>
 <layer name="Objects" width="20" height="27">
  <data encoding="base64" compression="zlib">
-   eJyNVc1Kw0AQ3hSrQjeaWK8e1DfwFeyr6NVTCwX14kEUzxbBB/FNBGuw/qDQ2lIVVKwtzpiZ7mS60Q4Mm2x2v/nm25lNITbmNTKm8M8YwDiy5tf+WjcNFo5oCeLF2RjyvRD7eeAavTYgzO1FN/8C809Rdp2Og9YtGdMDX5lx2LivGhqzDv5YymL2oyw/OSd1QothfxCmz1cwPwf+XkpHXx4+fimQy1HbWeCeNxbc+jx+CfGrhykntiOB4zPf+Up7IKwu4XwuGdOB58Mi6CvmfvnG/vPV2BXgOIT1x+DzZWMGMDYAbwTjOc01gnx+eXw/SunZshWB+6x1I6/31aTvjGqA1ZuiP1qst8LEM7qMsphN64+t88F6wzrT/dC32VpFa/3Tc7vke+C3Yq2ue9lznDO+l8NsHjXSeJ8wuzk5MVaiYiLfROTB9mwdZk/1EmMNSGt9J8g8TmDcAW9bx3NX6YA9ckPfN6mfhzk6dmD+mDCZ52ngasOHj7YFHL+smehzjJcozA5hVUjbqqhjja+9K/odMU+EMz5rcRA4TIxZE3E4ptS8LbC/bT4+n12PtJExR3TWeP/i87V12rHh2qYH3+ey3lg71HPo0fqN4iSEzxZwTZvJ+kFrKX6yniX3OuHwuWEeuXdUPDk35kS8+e7G+Hj3vln/P5LvAj33RDmhxvzPikOn03hv5PJ+oT13Ii/WZhX2roFfwLdlGO+VLthDP+Nu5qo=
+   eJyNVc1KA0EMzhb/oLO6q149qG/gK+irePZkQVAvHsTiWRF8EN9EUBfrDwrWlmpBRW0x6SZONp3VBkJ2ZzNfkm+S2UoK8JoAVP6xEdq+g4H85TcKFlmSjPDSYgz9XknDeZCP9Y0Ys6cwX3D9MSn62TgkrSpAG3VhzGPTvs0YYBn1oVrE7CTF/PSa5okkxf1RnD9f4Pok6ls1t6E6QvnlQL5GKyeRf16Z9v5l+WWc31ac5yRyoHCsyP7QOYrcM1aLcT5mAZr4vD+O/Kq1Qb5p+Hwt9hrm2EP/OurUHMAX2mPE66M95bVjxh6l/0Teq/nZioxj7hPOW/EP9WTojGqI1R5hPhrCt8GkMzpPipiXLhzb1kP9Rn1m56Hjir1K0vhn5rZZd1BvzCx1kgAH4Gum97m4WEeNOd5lzFZJTYKVmZiUb6bqEHl2HrNtZkmwvpjriz/qOES7gfrkfJ7bhgfaf83fV3meeyU8NnG9zpiS51HkeyOET7I+A/DpYGjOKV5mMJuMtcbcbqo+tvhWW2reCfNQqeALF3uRx6SYNRVHYmrOnxT2tyvHl7NrMzc6Zp/Pmu5fer5ynjsR8r0M4IdU95twR3z2Alx3OU7G+CKR9DQM9w9Jw+Sn+1nnvsU4cm5UR+kdlQ6v/ebEecvdTfHp7u268D9S7gK79sg1Ecfyz0pjz9Pv3sTX/cJ7blVdws0i7l1CPcNv82jvDC80Qz8lc+iv
  </data>
 </layer>
 <layer name="Above" width="20" height="27">
  <data encoding="base64" compression="zlib">
-   eJxjYCANfBAgUQMQnOVmYDjHjSr2kQxzYOAu0Kx73ITVEQMocQc+AAonaphNK/eRCnDFO8h91PIrNrOJBcSmS2xmwtyPTBMDjgtgmklO/sAG6Bmexym0i1p+HgW0B7TMr9QE+PIpMQBbmsalF5+5hPIGTB++soPU8Mamlhj9pJZb5AL08hJZDBcbRgMA1B081A==
+   eJxjYCANfBAgUQMQnOVmYDjHjSr2kQxzYOAu0Kx73ITVEQMocQc+AAonapiNbsZXVuL0fSNSnSgbcerEcKgDuY9afsVmNrGA2HSJzUyY+5FpYsBxAUwzyckf2AA9w/M4hXZRy8+jgPaAlvmVmgBfPiUGYEvTuPTiM5dQ3oDpw1d2kBre2NQSo5/UcotcgF5eIovhYsNoAPjHPgA=
  </data>
 </layer>
 <layer name="Walkable" width="20" height="27">
@@ -169,29 +168,31 @@
    <property name="place" value="south1"/>
   </properties>
  </object>
+  <object name="sign_rbfcr8" type="sign" x="448" y="544" width="32" height="32"/>
 </objectgroup>
 <objectgroup name="Spawn" width="20" height="27">
-  <object name="forestserpent1" type="spawn" x="352" y="384" width="64" height="32"/>
-  <object name="beetle2" type="spawn" x="352" y="448" width="64" height="32">
+  <object name="forestfox2" type="spawn" x="352" y="384" width="64" height="32"/>
+  <object name="forestfox2" type="spawn" x="352" y="448" width="64" height="32">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
  </object>
-  <object name="forestfly3" type="spawn" x="96" y="640" width="128" height="160">
+  <object name="forestserpent2" type="spawn" x="96" y="640" width="128" height="160">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
  </object>
-  <object name="forestboar3" type="spawn" x="320" y="704" width="160" height="128">
+  <object name="beetle2" type="spawn" x="320" y="704" width="160" height="128">
   <properties>
    <property name="quantity" value="3"/>
   </properties>
  </object>
-  <object name="forestwolf1" type="spawn" x="480" y="704" width="128" height="160">
+  <object name="forestserpent2" type="spawn" x="480" y="704" width="128" height="160">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
  </object>
+  <object name="redft1" type="spawn" x="352" y="96" width="32" height="32"/>
 </objectgroup>
 <objectgroup name="Keys" width="20" height="27" visible="0"/>
 </map>
--- a/AndorsTrail/res/xml/roadbeforecrossroads9.tmx
+++ b/AndorsTrail/res/xml/roadbeforecrossroads9.tmx
@@ -1,128 +1,127 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="25" height="24" tilewidth="32" tileheight="32">
 <properties>
  <property name="outside" value="1"/>
 </properties>
 <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="576" height="192"/>
 </tileset>
 <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="576" height="192"/>
 </tileset>
 <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="576" height="192"/>
 </tileset>
 <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="480" height="256"/>
 </tileset>
 <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="480" height="256"/>
 </tileset>
 <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="512" height="256"/>
 </tileset>
 <layer name="Ground" width="25" height="24">
  <data encoding="base64" compression="zlib">
@@ -170,32 +169,29 @@
   </properties>
  </object>
 </objectgroup>
- <objectgroup name="Spawn" width="25" height="24" visible="0">
-  <object name="forestwolf1" type="spawn" x="160" y="544" width="96" height="64"/>
+ <objectgroup name="Spawn" width="25" height="24">
  <object name="forestserpent2" type="spawn" x="256" y="640" width="96" height="64"/>
-  <object name="hadar_1" type="spawn" x="160" y="96" width="32" height="32"/>
-  <object name="morphrang_1" type="spawn" x="128" y="160" width="96" height="192">
+  <object name="ccentip" type="spawn" x="288" y="352" width="32" height="32"/>
+  <object name="zombie2" type="spawn" x="416" y="416" width="320" height="192">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
  </object>
-  <object name="hadar_2" type="spawn" x="288" y="352" width="32" height="32"/>
-  <object name="hadar_1" type="spawn" x="416" y="416" width="320" height="192">
+  <object name="zombie2" type="spawn" x="416" y="352" width="32" height="32"/>
+  <object name="zombie2" type="spawn" x="352" y="160" width="160" height="96"/>
+  <object name="zombie2" type="spawn" x="512" y="96" width="256" height="256">
   <properties>
    <property name="quantity" value="3"/>
   </properties>
  </object>
-  <object name="morphrang_1" type="spawn" x="416" y="320" width="64" height="32">
+  <object name="forestserpent2" type="spawn" x="128" y="544" width="128" height="64"/>
+  <object name="redft2" type="spawn" x="160" y="96" width="32" height="32"/>
+  <object name="ccentip" type="spawn" x="160" y="224" width="32" height="32"/>
+  <object name="ccentip" type="spawn" x="128" y="256" width="160" height="160">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
  </object>
-  <object name="hadar_2" type="spawn" x="352" y="160" width="160" height="96"/>
-  <object name="morphrang_1" type="spawn" x="512" y="96" width="256" height="256">
-   <properties>
-    <property name="quantity" value="3"/>
-   </properties>
-  </object>
 </objectgroup>
 <objectgroup name="Keys" width="25" height="24"/>
 </map>
--- a/AndorsTrail/res/xml/roadcave0.tmx
+++ b/AndorsTrail/res/xml/roadcave0.tmx
@@ -1,125 +1,124 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="20" height="20" tilewidth="32" tileheight="32">
 <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="576" height="192"/>
 </tileset>
 <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="576" height="192"/>
 </tileset>
 <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="576" height="192"/>
 </tileset>
 <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="480" height="256"/>
 </tileset>
 <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="480" height="256"/>
 </tileset>
 <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="512" height="256"/>
 </tileset>
 <layer name="Ground" width="20" height="20">
  <data encoding="base64" compression="zlib">
@@ -156,33 +155,32 @@
  </object>
 </objectgroup>
 <objectgroup name="Spawn" width="20" height="20">
-  <object name="forestsnail2" type="spawn" x="288" y="96" width="288" height="224">
+  <object name="jelly1" type="spawn" x="224" y="512" width="32" height="32"/>
+  <object name="jelly1" type="spawn" x="64" y="224" width="96" height="32">
   <properties>
-    <property name="quantity" value="4"/>
+    <property name="quantity" value="3"/>
   </properties>
  </object>
-  <object name="forestsnail1" type="spawn" x="224" y="128" width="32" height="32"/>
-  <object name="forestsnail1" type="spawn" x="64" y="160" width="128" height="96"/>
-  <object name="forestsnail1" type="spawn" x="96" y="256" width="32" height="32"/>
-  <object name="forestsnail1" type="spawn" x="32" y="288" width="128" height="160">
+  <object name="jelly2" type="spawn" x="32" y="288" width="128" height="160">
   <properties>
-    <property name="quantity" value="2"/>
+    <property name="quantity" value="3"/>
   </properties>
  </object>
-  <object name="forestsnail1" type="spawn" x="224" y="512" width="32" height="32"/>
-  <object name="forestsnail1" type="spawn" x="288" y="480" width="160" height="128">
+  <object name="jelly1" type="spawn" x="288" y="480" width="192" height="128">
   <properties>
-    <property name="quantity" value="2"/>
+    <property name="quantity" value="3"/>
   </properties>
  </object>
-  <object name="forestsnail1" type="spawn" x="480" y="512" width="32" height="64">
+  <object name="jelly2" type="spawn" x="96" y="480" width="96" height="96"/>
+  <object name="jelly1" type="spawn" x="192" y="128" width="32" height="32"/>
+  <object name="jelly1" type="spawn" x="256" y="96" width="288" height="128">
   <properties>
-    <property name="quantity" value="2"/>
+    <property name="quantity" value="3"/>
   </properties>
  </object>
-  <object name="forestsnail2" type="spawn" x="96" y="448" width="128" height="128">
+  <object name="jelly2" type="spawn" x="288" y="192" width="192" height="128">
   <properties>
-    <property name="quantity" value="2"/>
+    <property name="quantity" value="3"/>
   </properties>
  </object>
 </objectgroup>
--- a/AndorsTrail/res/xml/roadcave1.tmx
+++ b/AndorsTrail/res/xml/roadcave1.tmx
@@ -1,125 +1,124 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="25" height="25" tilewidth="32" tileheight="32">
 <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="576" height="192"/>
 </tileset>
 <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="576" height="192"/>
 </tileset>
 <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="576" height="192"/>
 </tileset>
 <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="480" height="256"/>
 </tileset>
 <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="480" height="256"/>
 </tileset>
 <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="512" height="256"/>
 </tileset>
 <layer name="Ground" width="25" height="25">
  <data encoding="base64" compression="zlib">
@@ -150,46 +149,40 @@
  </object>
 </objectgroup>
 <objectgroup name="Spawn" width="25" height="25">
-  <object name="forestsnail2" type="spawn" x="64" y="224" width="32" height="192"/>
-  <object name="forestsnail1" type="spawn" x="96" y="448" width="32" height="96"/>
-  <object name="forestsnail2" type="spawn" x="64" y="608" width="64" height="160">
+  <object name="jelly_b" type="spawn" x="608" y="128" width="160" height="96"/>
+  <object name="jelly3" type="spawn" x="608" y="288" width="160" height="320">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
  </object>
-  <object name="forestsnail2" type="spawn" x="192" y="736" width="64" height="32"/>
-  <object name="forestsnail3" type="spawn" x="256" y="352" width="32" height="288">
+  <object name="jelly3" type="spawn" x="608" y="640" width="160" height="96"/>
+  <object name="jelly1" type="spawn" x="512" y="672" width="32" height="64"/>
+  <object name="jelly3" type="spawn" x="480" y="544" width="32" height="32"/>
+  <object name="jelly3" type="spawn" x="480" y="224" width="32" height="256">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
  </object>
-  <object name="forestsnail2" type="spawn" x="288" y="256" width="64" height="32">
+  <object name="jelly2" type="spawn" x="256" y="384" width="32" height="224">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
  </object>
-  <object name="forestsnail3" type="spawn" x="320" y="96" width="224" height="128">
+  <object name="jelly3" type="spawn" x="320" y="96" width="224" height="96">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
  </object>
-  <object name="forestsnail2" type="spawn" x="480" y="256" width="32" height="128"/>
-  <object name="forestsnail3" type="spawn" x="448" y="480" width="96" height="192">
+  <object name="jelly3" type="spawn" x="288" y="288" width="32" height="32"/>
+  <object name="jelly2" type="spawn" x="224" y="640" width="32" height="96"/>
+  <object name="jelly3" type="spawn" x="160" y="736" width="32" height="32"/>
+  <object name="jelly2" type="spawn" x="64" y="608" width="64" height="128">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
  </object>
-  <object name="forestsnail4" type="spawn" x="608" y="128" width="160" height="256">
-   <properties>
-    <property name="quantity" value="2"/>
-   </properties>
-  </object>
-  <object name="forestsnail3" type="spawn" x="608" y="448" width="64" height="192">
-   <properties>
-    <property name="quantity" value="2"/>
-   </properties>
-  </object>
-  <object name="forestsnail4" type="spawn" x="480" y="640" width="288" height="128">
+  <object name="jelly2" type="spawn" x="96" y="448" width="32" height="96"/>
+  <object name="jelly2" type="spawn" x="64" y="224" width="32" height="160">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
--- a/AndorsTrail/res/xml/tradehouse0.tmx
+++ b/AndorsTrail/res/xml/tradehouse0.tmx
@@ -135,7 +135,7 @@
   eJxjYKAeCBcgT44e5qQK4JZDVoNNnBz3kGoOKeaji51mxW8GKf4i5EZcemK5gTQ3Quw4MwPDCWZUdRHcqHpItRsdgPyVhkUPNrGBAgBztQ5f
  </data>
 </layer>
- <layer name="Walkable" width="18" height="12" visible="0">
+ <layer name="Walkable" width="18" height="12">
  <data encoding="base64" compression="zlib">
   eJxzFWBgcB3FcIwMsInjU4+uhpB6fG7AxydHDpf70MXxAWLch8vPpPqTVHPw+YsUQEo6IUYdADdONHc=
  </data>
@@ -153,9 +153,23 @@
    <property name="place" value="up"/>
   </properties>
  </object>
+  <object name="rest1" type="rest" x="448" y="96" width="32" height="32"/>
+  <object name="rest2" type="rest" x="512" y="96" width="32" height="32"/>
+  <object name="rest3" type="rest" x="448" y="192" width="32" height="32"/>
+  <object name="rest4" type="rest" x="512" y="192" width="32" height="32"/>
+  <object name="rest5" type="rest" x="512" y="288" width="32" height="32"/>
 </objectgroup>
 <objectgroup name="Spawn" width="0" height="0">
-  <object name="orraph" type="spawn" x="384" y="224" width="32" height="32"/>
+  <object name="kantya" type="spawn" x="64" y="128" width="64" height="64"/>
+  <object name="maevalia" type="spawn" x="192" y="224" width="96" height="32"/>
+  <object name="khorailla" type="spawn" x="256" y="128" width="96" height="32"/>
+  <object name="drashad" type="spawn" x="32" y="224" width="96" height="128"/>
+ </objectgroup>
+ <objectgroup name="Keys" width="0" height="0">
+  <object name="charwood1:115" type="key" x="448" y="320" width="32" height="32">
+   <properties>
+    <property name="phrase" value="charwood_rest"/>
+   </properties>
+  </object>
 </objectgroup>
- <objectgroup name="Keys" width="0" height="0"/>
 </map>
--- a/AndorsTrail/res/xml/tradehouse0a.tmx
+++ b/AndorsTrail/res/xml/tradehouse0a.tmx
@@ -135,9 +135,9 @@
   eJxjYKAeCBcgX+0uXtxyW3kZMMA2XlS1HCwMDJwsxLknFSi+gxdTbaoAqtmEzMEG8KmlpTnpONSnkWgOKW7EpwefvaSYQ4zaF8zk242uNpUMd+MDAPURDvc=
  </data>
 </layer>
- <layer name="Walkable" width="18" height="12" visible="0">
+ <layer name="Walkable" width="18" height="12">
  <data encoding="base64" compression="zlib">
-   eJxzFWBgcB3FeDEhgE8ttcxBlidFPTF2kOJGeriHFDvJMYeeaQcAAvYs1A==
+   eJxzFWBgcB3FeDEhgE8ttcxBlidFPTF2kOJGeriHFDvRzSA1nGmNATayLSk=
  </data>
 </layer>
 <objectgroup name="Mapevents" width="18" height="12">
@@ -148,6 +148,9 @@
   </properties>
  </object>
 </objectgroup>
- <objectgroup name="Spawn" width="18" height="12"/>
+ <objectgroup name="Spawn" width="18" height="12">
+  <object name="falothen1" type="spawn" x="384" y="256" width="128" height="64"/>
+  <object name="fayvara1" type="spawn" x="192" y="128" width="160" height="96"/>
+ </objectgroup>
 <objectgroup name="Keys" width="18" height="12"/>
 </map>
--- a/AndorsTrail/res/xml/tradehouse1.tmx
+++ b/AndorsTrail/res/xml/tradehouse1.tmx
@@ -1,125 +1,124 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="18" height="8" tilewidth="32" tileheight="32">
 <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="576" height="192"/>
 </tileset>
 <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="576" height="192"/>
 </tileset>
 <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="576" height="192"/>
 </tileset>
 <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="480" height="256"/>
 </tileset>
 <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="480" height="256"/>
 </tileset>
 <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="512" height="256"/>
 </tileset>
 <layer name="Ground" width="18" height="8">
  <data encoding="base64" compression="zlib">
@@ -150,7 +149,8 @@
  </object>
 </objectgroup>
 <objectgroup name="Spawn" width="18" height="8">
-  <object name="wandor" type="spawn" x="416" y="96" width="32" height="32"/>
+  <object name="lethenlor" type="spawn" x="512" y="160" width="32" height="32"/>
+  <object name="lleglaris" type="spawn" x="32" y="160" width="32" height="32"/>
 </objectgroup>
 <objectgroup name="Keys" width="18" height="8"/>
 </map>
--- a/AndorsTrail/res/xml/waytolostmine0.tmx
+++ b/AndorsTrail/res/xml/waytolostmine0.tmx
@@ -1,128 +1,127 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="30" height="30" tilewidth="32" tileheight="32">
 <properties>
  <property name="outside" value="1"/>
 </properties>
 <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="576" height="192"/>
 </tileset>
 <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="576" height="192"/>
 </tileset>
 <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="576" height="192"/>
 </tileset>
 <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="480" height="256"/>
 </tileset>
 <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="480" height="256"/>
 </tileset>
 <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="512" height="256"/>
 </tileset>
 <layer name="Ground" width="30" height="30">
  <data encoding="base64" compression="zlib">
@@ -139,7 +138,7 @@
   eJzVlc0NwjAMhQt3pPaMmCsb0I3YCFinbAAIRbLM82/SSn2XSlHqL362k2HI63bC62XE64cpzpiFWGjfle+dfszz8X8/WkOxXgaf56rF1QTPH+BmFY0TOSPXk/xrcanvy2jXwSOvx5zVykZMKafebEuLEr+F7Z3bnvLUd418C+hVjYOU8atyOet756H+QvlF57l67Mkv6oHFlBjV796zwuu6laS6ts6U9TahO5l6f/98H84zeN9BVNvoWxiVFN/LzPZarzd7S25Lz11YD3h9o/WR5s6ax9n4X2N6JOVRjLuR+5npc8TWarzmPPEaU+2x3/fK7fX2vQHpgUYT
  </data>
 </layer>
- <layer name="Walkable" width="30" height="30" visible="0">
+ <layer name="Walkable" width="30" height="30">
  <data encoding="base64" compression="zlib">
   eJzNktEJACEMQx3hlnL/le7LnwN7TZNUC4Kg9pmk8xljGtYqR+8Mt5N9gnmD1hPcte/0T6H3rxzsiIOwGc3Vngw74rq8ZvXu3ld9QrSg3Exfx2zt7n8rOkMzRjxESsFE+Y75U/5dwWa5Ch9RbqY/wz05E1X/WL+r79mMGSart1NnVx4qbjezkskNHr9b/PEP
  </data>
@@ -158,55 +157,54 @@
   </properties>
  </object>
 </objectgroup>
- <objectgroup name="Spawn" width="30" height="30" visible="0">
-  <object name="mpr1" type="spawn" x="448" y="800" width="128" height="96"/>
-  <object name="scaradon_1" type="spawn" x="544" y="704" width="128" height="96"/>
-  <object name="mpr1" type="spawn" x="576" y="640" width="32" height="32"/>
-  <object name="mpr1" type="spawn" x="416" y="608" width="160" height="32">
+ <objectgroup name="Spawn" width="30" height="30">
+  <object name="ccentip" type="spawn" x="448" y="800" width="128" height="96"/>
+  <object name="ccentip" type="spawn" x="544" y="704" width="128" height="96"/>
+  <object name="ccentip" type="spawn" x="576" y="640" width="32" height="32"/>
+  <object name="ccentip" type="spawn" x="416" y="608" width="160" height="32">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
  </object>
-  <object name="scaradon_1" type="spawn" x="288" y="608" width="128" height="64"/>
-  <object name="mpr2" type="spawn" x="96" y="640" width="224" height="192">
+  <object name="ccentip" type="spawn" x="96" y="640" width="224" height="192">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
  </object>
-  <object name="scaradon_1" type="spawn" x="160" y="512" width="64" height="32">
+  <object name="ccentip" type="spawn" x="160" y="512" width="64" height="32">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
  </object>
-  <object name="mpr1" type="spawn" x="224" y="448" width="32" height="32"/>
-  <object name="mpr2" type="spawn" x="256" y="384" width="64" height="32"/>
-  <object name="scaradon_2" type="spawn" x="224" y="192" width="224" height="96">
+  <object name="ccentip" type="spawn" x="224" y="448" width="32" height="32"/>
+  <object name="ccentip" type="spawn" x="256" y="384" width="64" height="32"/>
+  <object name="ccentip" type="spawn" x="256" y="160" width="160" height="96"/>
+  <object name="ccentip" type="spawn" x="416" y="160" width="160" height="256">
+   <properties>
+    <property name="quantity" value="3"/>
+   </properties>
+  </object>
+  <object name="ccentip" type="spawn" x="512" y="416" width="64" height="32">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
  </object>
-  <object name="scaradon_1" type="spawn" x="416" y="160" width="160" height="256">
+  <object name="charwdgg" type="spawn" x="544" y="480" width="32" height="32"/>
+  <object name="ccentip" type="spawn" x="608" y="416" width="288" height="192">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
  </object>
-  <object name="mpr1" type="spawn" x="512" y="416" width="64" height="32">
+  <object name="charwdg1" type="spawn" x="640" y="64" width="128" height="160">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
  </object>
-  <object name="scaradon_2" type="spawn" x="544" y="480" width="32" height="32"/>
-  <object name="mpr3" type="spawn" x="608" y="416" width="288" height="192">
+  <object name="ccentip" type="spawn" x="736" y="256" width="96" height="96">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
  </object>
-  <object name="scaradon_2" type="spawn" x="576" y="416" width="320" height="192"/>
-  <object name="scaradon_2" type="spawn" x="640" y="64" width="192" height="288">
-   <properties>
-    <property name="quantity" value="4"/>
-   </properties>
-  </object>
 </objectgroup>
 <objectgroup name="Keys" width="30" height="30"/>
 </map>
--- a/AndorsTrail/res/xml/waytolostmine1.tmx
+++ b/AndorsTrail/res/xml/waytolostmine1.tmx
@@ -1,128 +1,127 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="30" height="27" tilewidth="32" tileheight="32">
 <properties>
  <property name="outside" value="1"/>
 </properties>
 <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="576" height="192"/>
 </tileset>
 <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="576" height="192"/>
 </tileset>
 <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="576" height="192"/>
 </tileset>
 <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="480" height="256"/>
 </tileset>
 <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="480" height="256"/>
 </tileset>
 <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="512" height="256"/>
 </tileset>
 <layer name="Ground" width="30" height="27">
  <data encoding="base64" compression="zlib">
@@ -131,7 +130,7 @@
 </layer>
 <layer name="Objects" width="30" height="27">
  <data encoding="base64" compression="zlib">
-   eJyFVs1OU0EUnktpgvReU+yCtW51ZaI+gMgruKhr30ASjUrihlBlIwkNjQ/iG7A3UZZQIMFQWpXERGmpzsd8h/k6XPQkk3PvmZnz852few/rzn3368SvbM65/dw55/nUXJBdxe3sC//8qh7uQKbc9sp0mE08//D82OtaKMr1KG8UQe8ybLqgB/chB4dP4K9pO9WhsUG2nkU/N7Og03iHfNXzu9eda2VhT31POWwf5NEv5XrGYtiqRxst2vuQhffUj/9hY/ipP2m8TdrblnhXquH59IZzA/IOOeSP5SxwsOcN+glqJLlL44XdvsflKA933vrVroa7sw3nxlngbXKceUpfDR/l8AE4Ab8dr/NaLWJk8RrGA79/0/t3y6+hf57367l/7vEefIJ8169nRVCDXDxqRFvAaJUyYAT8cA80yid7qEnbL4kbMOuI3xslsYCgr8OY2sS2XY37Y/JhHnExzLMi2MX6mAds1IbFZHVl8gfTkSOme3j3a5r4AJOHhfQ5yeraMIbdGY9ln3rvNyZxw/u3LMpr0xEHpV3GZrNlWXqon8d4m2Ib8Z6xf96wLgw3yP6InZ+1EBfookdc1HXq97r55R5HDY3zYLfl1zu/1uoBK2D32T9/8ev3bLRl8S0VsVbSfmxRd6WYrCE7Z7HDbpd1qrnoJe/pPALBJ52th5LHnsx72NnjLFecFR9QV+rvqjkLrr4tSD0hj8f55RmBd/OtSVxalPfzWBsgOzeibMD9M5m95ttMLeLfKJmRJyUx7kqtgVrs47I5dMEFR9TGutRdOiPsrNad1eU2/Qd1WM+b2eQ3QX1QvYgXM2w+mRGK8QlruC9nRhIvbCxyzoEWOQdXqpPvqtewRgy3pyb9Uqx3aDPTnmA+7bs35vfha4WzsMqe5r7Gi2/Tk3rM7bntkvwivi3ObKtBzS/8Rh9j/v2qhBxgBp7XC2eixgtCjseSs7L84v42sT6QeHfox4DfHMOixx5f4nfIcqR9cg59Ee4fJP1rPnyqx3qCbu35i3y72FOVIp4tw89q60h0ag3Y2S7tDLg/L/VgNWx+dZIeQqwpflpbmKfmZ2p7L4kPhPOwDV+1b/Bf8T6Lc6IMP62tIfNkcajtocrn4swFYWb0uX9najI2yNR2mt81cquZtKfAUVeQq88jzpH1LOKZxqZ3NL9Gltu+2i6Z7Wm8Rv/6Ny6LF9icSh+lWMCfv6Hse80=
+   eJyFVstOFEEUrWaYBJluMzgL1rrVlYn6AaK/4ALX/oEkGpXEDWGUjSRMmPgh/gF7E2UJAyQYhhmVxESZYbQOdS51umhiJZXbXY977zn30X3YdO6Hnyd+ZnPO7efOOS+n5sLaVdLOvvTPr5vhDtZU2l6VDrOJ559eHntdC0W1HpWtIuhdhk0X9OA+1iHhE+Qb2k51KDasrWfRz80s6DTZpVz18u5159pZ2FPfUwnbB3n0S6WeMQxbzWijTXsfs/Ce+vE/bow/9SfFu0h724J3pR6eT284N6TsUmL9iZwFD/a8QT8xWknsUrywO/C8HOXhzjs/O/Vwd7bl3CQLskOJM8/oq/GjEj6AJ/C343Vea0SODK9xPPT7N71/t/wc+ed5P1/45z7vwSes7/r5vAhqEItHrWgLHK1yDRyBP9zDGOflGlqk7VfkDZx1xe+NCiwY0Nclpg657dTj/oRylEdejPOsCHYxP+WBG7VhmCyvbP3BdJTAdA/vfk6TH3DysJA657C8No5hd8ZzOaDe+60yb3j/nsX1xnTkQccusVlvWZYaGuQR76LYBt4z1s9b5oXxhrW/YudXI+DCuKgRF3Wd+r1efrnGkUOTPNht+/nez7Vm4ArcffHPX/38MxttGb6lIuZKWo9t6q4V5Ryyc4YddnvMU41FP3lP+xEGfNLeeihx7Eu/h5099nLlWfnB6En+XdVnIdW3BcknxPE4v9wj8G6+LZKXNtcHecwNDDs35tqQ+2fSe823mUbkv1XRI08qMO5KrmG0WcdVfehCCo/IjXXJu7RH2FnNO8vLbfqP0WU+b2blb4L6oHqBFz1sPukRyvEJc3ggZ8aCFzYes89hPGYfXKmX31WvcQ0Mt6fKfinXO7SZaU0wnvbdm/D78K3GXlhnTXNf8eLb9LQZY3tuuyK+wLfFnm05qPGF36hj9L/ftRAD9MDzfGFPVLwYiPFEYlYVX9zfJtcHgneHfgz5zTEu+qzxJX6HLEZaJ+fUF+H+QVK/5sPnZswn6Naav4i3izVVK+LZKv4st45Ep+aAne3RzpD785IPlsPmVzepIWBN+dPcQj81P1Pbewk+DJyHbfiqdYP/ig9Z7BNV/GlujRgnw6G2R7o+F3suBnrGgPt3psrYsKa20/iuUVrOpDUFibzCuvo8Zh9ZzyKfKTa9o/G1YbEdqO2K3q547T9iP79c8yVsFXjBzanUUcoF/PkHCjN89w==
  </data>
 </layer>
 <layer name="Above" width="30" height="27">
@@ -141,7 +140,7 @@
 </layer>
 <layer name="Walkable" width="30" height="27">
  <data encoding="base64" compression="zlib">
-   eJztksERwCAIBC0hTdl/S5l8HZFjRc1DZngJt9wl9Sml3r59oL/araeWyovMK1qeJ3InyS2aD7nF01c0rZnRbuuBZDnKYWVuRL/3RrhZ33c1V/H/Ry65c5ZL89nJ9WYIV9nP5PbmvcrKzvLb6kS4ajat3xP/FuUSNt3J0phln+Za7y9FUdYq
+   eJztksERwCAIBC0hTdl/S5l8HZFjRc1DZngJt9wl9Sml3r59oL/araeWyovMK1qeJ3InyS2aD7nF01c0rZnRbuuBZDnKYWVuRL/3RrhZ33c1V/H/Ry65c5ZL89nJ9WYIV9nP5PbmvcrKzvLb6kS4ajat3xP/FuUSNt3J0phlZ9w+w7XeX6DF1yk=
  </data>
 </layer>
 <objectgroup name="Mapevents" width="30" height="27">
@@ -182,53 +181,41 @@
   </properties>
  </object>
 </objectgroup>
- <objectgroup name="Spawn" width="30" height="27" visible="0">
-  <object name="mpr3" type="spawn" x="672" y="640" width="128" height="192">
+ <objectgroup name="Spawn" width="30" height="27">
+  <object name="charwdg1" type="spawn" x="672" y="640" width="128" height="160"/>
+  <object name="charwdg1" type="spawn" x="672" y="576" width="64" height="32">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
  </object>
-  <object name="scaradon_2" type="spawn" x="640" y="640" width="160" height="192"/>
-  <object name="mpr2" type="spawn" x="672" y="576" width="64" height="32">
+  <object name="charwdg1" type="spawn" x="640" y="416" width="96" height="160">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
  </object>
-  <object name="scaradon_3" type="spawn" x="640" y="416" width="96" height="160">
+  <object name="charwdg1" type="spawn" x="704" y="352" width="32" height="32"/>
+  <object name="charwdg1" type="spawn" x="512" y="352" width="128" height="96"/>
+  <object name="charwdg2" type="spawn" x="416" y="352" width="64" height="32"/>
+  <object name="charwdg1" type="spawn" x="192" y="384" width="128" height="32"/>
+  <object name="charwdg1" type="spawn" x="128" y="416" width="32" height="96"/>
+  <object name="charwdg2" type="spawn" x="544" y="256" width="32" height="32"/>
+  <object name="charwdg2" type="spawn" x="96" y="640" width="64" height="32">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
  </object>
-  <object name="mpr4" type="spawn" x="704" y="352" width="32" height="32"/>
-  <object name="mpr3" type="spawn" x="512" y="352" width="128" height="96"/>
-  <object name="scaradon_3" type="spawn" x="416" y="352" width="64" height="32"/>
-  <object name="mpr4" type="spawn" x="192" y="384" width="128" height="32"/>
-  <object name="scaradon_3" type="spawn" x="128" y="288" width="64" height="224">
+  <object name="charwdg1" type="spawn" x="64" y="512" width="96" height="128"/>
+  <object name="charwdg1" type="spawn" x="160" y="736" width="32" height="64"/>
+  <object name="charwdg2" type="spawn" x="224" y="704" width="32" height="32"/>
+  <object name="charwdg1" type="spawn" x="224" y="608" width="160" height="96"/>
+  <object name="charwdg1" type="spawn" x="384" y="640" width="32" height="32"/>
+  <object name="charwdg2" type="spawn" x="768" y="256" width="32" height="32"/>
+  <object name="charwdg1" type="spawn" x="832" y="192" width="64" height="96">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
  </object>
-  <object name="mpr4" type="spawn" x="512" y="192" width="192" height="160">
-   <properties>
-    <property name="quantity" value="2"/>
-   </properties>
-  </object>
-  <object name="mpr3" type="spawn" x="96" y="640" width="64" height="32">
-   <properties>
-    <property name="quantity" value="2"/>
-   </properties>
-  </object>
-  <object name="mpr5" type="spawn" x="64" y="512" width="96" height="128"/>
-  <object name="mpr4" type="spawn" x="160" y="736" width="32" height="64"/>
-  <object name="mpr5" type="spawn" x="224" y="704" width="32" height="96"/>
-  <object name="mpr4" type="spawn" x="224" y="608" width="160" height="96">
-   <properties>
-    <property name="quantity" value="2"/>
-   </properties>
-  </object>
-  <object name="mpr4" type="spawn" x="384" y="640" width="32" height="32"/>
-  <object name="mpr4" type="spawn" x="768" y="256" width="32" height="32"/>
-  <object name="scaradon_3" type="spawn" x="864" y="192" width="32" height="64">
+  <object name="charwdg2" type="spawn" x="352" y="192" width="160" height="32">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
--- a/AndorsTrail/res/xml/waytolostmine2.tmx
+++ b/AndorsTrail/res/xml/waytolostmine2.tmx
@@ -1,128 +1,127 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="29" height="28" tilewidth="32" tileheight="32">
 <properties>
  <property name="outside" value="1"/>
 </properties>
 <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="576" height="192"/>
 </tileset>
 <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="576" height="192"/>
 </tileset>
 <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="576" height="192"/>
 </tileset>
 <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="480" height="256"/>
 </tileset>
 <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="480" height="256"/>
 </tileset>
 <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="512" height="256"/>
 </tileset>
 <layer name="Ground" width="29" height="28">
  <data encoding="base64" compression="zlib">
@@ -136,12 +135,12 @@
 </layer>
 <layer name="Above" width="29" height="28">
  <data encoding="base64" compression="zlib">
-   eJy9lktOwzAQhp2gRoKClCyABfQE5T69QbkLF0AciMeSHUdghRQWVHQHU2eQM5mX3YpPipxYY/+e8XicECKvbRjThVB1466rOkxY1NEW2Y3ppnYeuPkpj3Sdwjr+i1thPRbfM73Fd65/lan5NbNtLDyauPfQnjeH0dTiCzqQMw9V/MZ2X03N18826tz9PtVZ7Lss9PXlKITrxtYE7hPftiexXTbTh8LZ3AyaC8d5Q47n4+/ngrxfD2NKz4yHvo17ROHiy9lK4wHO5z7po+NQU5rPGg+8DX3vRk4CENe1Ylcb9ZHW3zQ/emZeSw+h94gWD5xXAmL6cTp8MHdUKdr5S+PguaMQy890Xk+N3mTUcW6/EIyvp0ZfOGxSP6Ucy7mzOFsp7ugnlwfpPPDf8KSswZPHqZ5ETk3dcaD89dZUb/5afgLanmp11KMnnWsaX9RJx//VBwvy36rFBuMrxcUT15zaAaxanx79J87VoZoUiO8+c5ZoSvv/AzFQSrs=
+   eJy9lktOxDAMhtOiicRLahcMC5gTwH3mBsNduADiQDyW7DgCK6SyAMEOPKlR6vqVDOKTqrSRYyd/HKchJJ66MKUPoemnXWdtmLFqky2yHdPP7Txw/il3dJ7CPP6LK2E+Fp8LvcV3rn9dGPN9YdtYxGjb4N5De+Kwt1hGXV+IAzlz26RvbHcBtNX0fetSnOufpzlOfaeVa33cC+E82jGBm2xtXwepvYjzh8LZXI4xV47zhuwfTr8fKvJ+M46pPTMehi7tEYXTl7OVxgPcmoesj47DmJI/azzwPPa9GDkJgK4bxa416iOtv3l+DIxfKx5C7xFND/QrAZq+Ho0fzB1Vi3b+ch08dxRirTP366nRHwV1nNsvBPX11OilwyZfp5RjJXcWZyvpjuvk8iD3A/8N98ocPHmcx5Moqalb/ih/vTXVm7/WOgFtT7U66oknnWuqL8bJx//WBwvy36ppg/pKunh0LakdwLrzxaP/xKVxaEwK6LuLz5qY0v5/A37HShU=
  </data>
 </layer>
 <layer name="Walkable" width="29" height="28">
  <data encoding="base64" compression="zlib">
-   eJztUssNQCEIcwSXcv+VvBoin2KJF0i4PB8tpV1zjNXd3U1vWQy8H5weThWnhqm9e3OITqRuMxlPLV2WFwgfmq2MJsTfbM7ZWf6h09uJ7WUVZwSvSmfktqycRTVo/53f2TeT2FL/DcvaEdGp8Ugcr1AfIvMMPsZdKvKd3c/DeZl/0RnZfwPNfdl8
+   eJztUtsNACEIc4Rbyv1Xul9DRGgt8QcSYmK0D+j8xpjd3d3ytqXAe8EZ4VRxephIsT4ZDpY38r2eO2yED80W4wnZL5tzdZZf+Iw0qXdZxZnBq/KZma0qZ1kP3rv1Xj0zi23977BOGhGfHo/FiQrdQ+a/gk8xl4p8s/oinJv/Nz4z+n8tZ9kn
  </data>
 </layer>
 <objectgroup name="Mapevents" width="29" height="28">
@@ -169,44 +168,58 @@
    <property name="place" value="north"/>
   </properties>
  </object>
+  <object name="sign_wlostmine2" type="sign" x="512" y="320" width="32" height="32"/>
 </objectgroup>
- <objectgroup name="Spawn" width="29" height="28" visible="0">
-  <object name="mpr4" type="spawn" x="32" y="672" width="256" height="192">
+ <objectgroup name="Spawn" width="29" height="28">
+  <object name="charwdg1" type="spawn" x="64" y="672" width="224" height="192">
   <properties>
    <property name="quantity" value="3"/>
   </properties>
  </object>
-  <object name="mpr5" type="spawn" x="224" y="448" width="96" height="224">
+  <object name="charwdg1" type="spawn" x="224" y="448" width="96" height="192">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
  </object>
-  <object name="mpr5" type="spawn" x="288" y="416" width="32" height="32"/>
-  <object name="mpr4" type="spawn" x="96" y="256" width="64" height="160"/>
-  <object name="mpr5" type="spawn" x="192" y="320" width="32" height="32"/>
-  <object name="mpr6" type="spawn" x="224" y="320" width="352" height="96">
+  <object name="charwdg2" type="spawn" x="288" y="416" width="32" height="32"/>
+  <object name="charwdg2" type="spawn" x="96" y="256" width="128" height="160">
+   <properties>
+    <property name="quantity" value="2"/>
+   </properties>
+  </object>
+  <object name="charwdg2" type="spawn" x="224" y="320" width="352" height="96">
   <properties>
    <property name="quantity" value="3"/>
   </properties>
  </object>
-  <object name="mpr5" type="spawn" x="608" y="320" width="32" height="32"/>
-  <object name="mpr6" type="spawn" x="640" y="320" width="96" height="96"/>
-  <object name="mpr6" type="spawn" x="480" y="448" width="32" height="32"/>
-  <object name="mpr5" type="spawn" x="480" y="480" width="128" height="160">
+  <object name="charwdg3" type="spawn" x="480" y="448" width="32" height="32"/>
+  <object name="charwdg2" type="spawn" x="480" y="480" width="128" height="160">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
  </object>
-  <object name="mpr6" type="spawn" x="544" y="640" width="160" height="224">
+  <object name="charwdg3" type="spawn" x="544" y="672" width="64" height="32">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
  </object>
-  <object name="mpr7" type="spawn" x="704" y="640" width="192" height="128">
+  <object name="ccentip" type="spawn" x="704" y="672" width="192" height="96"/>
+  <object name="charwdg2" type="spawn" x="224" y="640" width="64" height="32">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
  </object>
+  <object name="charwdg2" type="spawn" x="576" y="320" width="160" height="96">
+   <properties>
+    <property name="quantity" value="2"/>
+   </properties>
+  </object>
+  <object name="charwdg2" type="spawn" x="544" y="704" width="160" height="128">
+   <properties>
+    <property name="quantity" value="2"/>
+   </properties>
+  </object>
+  <object name="ccentip" type="spawn" x="384" y="256" width="128" height="64"/>
 </objectgroup>
 <objectgroup name="Keys" width="29" height="28"/>
 </map>
--- a/AndorsTrail/res/xml/waytolostmine3.tmx
+++ b/AndorsTrail/res/xml/waytolostmine3.tmx
@@ -1,128 +1,127 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="29" height="30" tilewidth="32" tileheight="32">
 <properties>
  <property name="outside" value="1"/>
 </properties>
 <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="576" height="192"/>
 </tileset>
 <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="576" height="192"/>
 </tileset>
 <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="576" height="192"/>
 </tileset>
 <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="480" height="256"/>
 </tileset>
 <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="480" height="256"/>
 </tileset>
 <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="512" height="256"/>
 </tileset>
 <layer name="Ground" width="29" height="30">
  <data encoding="base64" compression="zlib">
@@ -131,7 +130,7 @@
 </layer>
 <layer name="Objects" width="29" height="30">
  <data encoding="base64" compression="zlib">
-   eJyNV81OE1EUnmkhMXrHzHRieAhdmcgLyDu4gIUbfANcGItLQwkbMTVIn8S9NnHnQrsxAaIJSbFVJCYIBb1f7/l6z9zeEk5yc+7v+T9nztSKJDnOk2Qtc7iwuGvxqsWpHb9ytw98xzi8YHFi36V2AMrM4SWLL+zZ0I6BHSfG7ePNbztqhcN6XhP+PTu+GX93TLuYvte3d95b/MGOc6FPPHmXTL/Vc01Py4b1pdZNMGzz2Z59seOHPT9S/PjuOnrGMOjD3u3U0RgK3kj9HDA+j9jjOnpqe9I+vdzTvrS0X6VODszv1ayewht+1HTu1qb5zuK3KzTeWryjdAF9QD1zcuxLzHxNq3YN+Wq/RvUTu4FfW3jev+3W0G0gfnso8Qo/nkf8TdwN/Bryo3/Ap6P8Rn9BN+TD08zxOsyrd2iXTZGTfhnrKjpqeUbG+4d8X847Oc4bbg0ef28myZm9uy18OsLndep50zet1Mn2TOUC/HsofgE8yn2M4/6beSfHrdLOhQ7utoUW7Aw+pw2vI+U8FTnB70Ve1bMf1Iux7nMyEjm388U5V4PoT8TOgXF0b5ReZ8qJPcjdCvwJnZYyH5O1wvMZSUxO+CZuT+f/vvHyreYunmH3xTm/j7fdQE+swa+ZV2MXMaD9BHu2VN4QIPOayH2hZCNA7l7gT71m7dhQ8cF46kj+AI6Ml3sCM3IFebSncilWh5kz7xouHnZkvikYa9qc92l72Ia2oHylymNivEe8rsj7geTMx4aLh5bMd7mXCo9C3TfVHG0rO/WVnfsqpzHfkjlq5wOJ01EQD3/q7gxwIrWBAJkWbaz+TL19sIZek/qXuBgbSCw25TuI2glaC5L3yK+mfK8oH/e+G7fuqRj4J/nSkZh7nvvRVPkP26zLHuvDwPh8HppqzwDM+0vSU9AWsMNQvd0z1TfwB+yLfKFPAawzLalT4XeX8c37+yo+kDfQfTnyzT4W3iPjv49b8t2AnKQzq0fBeiX3/QjrL98tR2RlrjCWD8VWAMhaZtX4pH247it/lCqWAGGNDfWEXHV5s674EkJeXO+Zqj94Tp+EdtV6dpU9NY3QnrHejP5AnA+Nt3OMn9YTvmTPeKDylHfYA4S9Es/r4gPWgVm+D2sfe0bAmaprrMm0Xagv3rP/ujDVO9reuhbFeq3toGec9G6Khu4JUUMeqxiiHXXtITzJp/OcfYmO16TwfHdSLx9l/BSJz5Av7j7Jve1i/wYAfhPHNVXxpXwd1TtdlcN4h3u6pw7jkZixHNrsqn+DWGyXWVWO/wGQsVs=
+   eJyNV09PE0EU320hMTprtt0YPoSeTOQLyHfwAAcv8A3wYCweDSVcxNQg/STetYk3D9qLCSWYkBRbRWKCUND5dd6v83Y6Jbxk8mZ2Z97f33s7W6klyUmeJOuZ4zXLO5avWp7a8St3z8HvGccXLE/sudQOUJE5vmT5pX03tGNgx6lxz3Hmtx2VmuN6XhH9XTsOjd87ll2b3te3ez5Y/tGOC5FPPjmXTJ/Vcy1P24b1lfZNOGLzxb77ascP+/5Y6eO5m/gZ45CPeLdSJ2MofDP1c9D4fSQeN/FTx5Px6eZe9pWV/Tp1dmD+oGL9FN3Io5ZzvzKtd5a+PZHxzvJd5Qvkg6qZs6MnmPmWluMa6tV5jfoncYO+luh8eNet4dtA8vZY8Io8XkTyTd4J8hrqY36gp63yxnzBN9TDs8zpOsrLexiXLbGTeRn7Kj5qe0bG54d6X807Oy7qbg0df28nybnduyN62qLnTep1MzfN1Nn2XNUC8nskeQE9yT3Gsf/tvLPjTmHnIgd7WyILcYaes7r3kXaeiZ3Q9zIv+9kP+sXY9zk3VqX2MV+ccz2I+QR2DoyTe6vwPtNOPIPdzSCf8Gkp85isCIagZySY5BqEZ7r+e6ZsH/CMuC/O+ec42wn8xBr6GnkZu8CAzhPi2VR1Q4LN62L3pbKNBLu7QT71mr1jU+GDeGpL/YCOjbd7QjNqBXW0r2op1odZM+/rDg+7Mt8SjjVjzv2MPWLDWNC+QtUxOc4DrytyfiA186nu8NCU+R6fpaKjpvabco22VJz6Ks59VdOYb8scvfOR4HQU4OFP1b0DnUpvIMGmRYvVn6mPD9bwa9L/EoexgWCxId9B9E7IWpC6R3015HtF+/jsu3HrrsLAP6mXtmDuRe5HQ9U/YrMhz9gfBsbX89CU7wzg3L8kdwrGAnEYqrP7pnwG+UB8US/MKYh9pil9KvzuEt/c31P4QN3A9+XIN/tEdI+M/z5uy3cDdlLOrDsK1iu5v4+w//LccsRW1gqxfCSxAsHWIivjk/Hhuq/yUSgsgcIeG/oJu6pyZkPpJYW6uN435XzwPXMSxlX72VHx1DLCeMbuZswHcD40Ps4xfdpP5JJ3xgNVp9zDO0B4V+L7quSAfWBW7sPexzsj6Fz1NfZkxi70F+d5/7o05T063roXxe5aO8GdcXJ3UzL0nRA95KnCEOOoew9pLZ+uc95LNF6Tmte7m3r7aOPnCD5Dvdi7lvvYxf4NQPwmjnuq0kv72urudF0N4xz26Tt1iEdyYjmM2XX/BjFsF1nZjv8XbLHQ
  </data>
 </layer>
 <layer name="Above" width="29" height="30">
@@ -182,58 +181,62 @@
   </properties>
  </object>
 </objectgroup>
- <objectgroup name="Spawn" width="29" height="30" visible="0">
-  <object name="mpr7" type="spawn" x="512" y="32" width="192" height="192">
+ <objectgroup name="Spawn" width="29" height="30">
+  <object name="charwdg3" type="spawn" x="576" y="64" width="96" height="96">
+   <properties>
+    <property name="quantity" value="2"/>
+   </properties>
+  </object>
+  <object name="charwdg2" type="spawn" x="384" y="192" width="160" height="192">
   <properties>
    <property name="quantity" value="3"/>
   </properties>
  </object>
-  <object name="mpr6" type="spawn" x="384" y="192" width="160" height="192">
+  <object name="charwdg2" type="spawn" x="320" y="352" width="32" height="32"/>
+  <object name="charwdg2" type="spawn" x="608" y="352" width="32" height="64">
+   <properties>
+    <property name="quantity" value="2"/>
+   </properties>
+  </object>
+  <object name="charwdg1" type="spawn" x="512" y="512" width="64" height="64"/>
+  <object name="charwdg3" type="spawn" x="288" y="544" width="160" height="32">
+   <properties>
+    <property name="quantity" value="2"/>
+   </properties>
+  </object>
+  <object name="charwdg2" type="spawn" x="512" y="608" width="256" height="256">
   <properties>
    <property name="quantity" value="3"/>
   </properties>
  </object>
-  <object name="mpr7" type="spawn" x="256" y="320" width="64" height="64"/>
-  <object name="mpr5" type="spawn" x="448" y="448" width="64" height="32">
-   <properties>
-    <property name="quantity" value="2"/>
-   </properties>
-  </object>
-  <object name="mpr7" type="spawn" x="576" y="448" width="32" height="32"/>
-  <object name="mpr6" type="spawn" x="608" y="352" width="32" height="64">
-   <properties>
-    <property name="quantity" value="2"/>
-   </properties>
-  </object>
-  <object name="mpr7" type="spawn" x="800" y="256" width="64" height="192"/>
-  <object name="mpr6" type="spawn" x="736" y="384" width="32" height="32"/>
-  <object name="mpr7" type="spawn" x="512" y="512" width="64" height="64"/>
-  <object name="mpr8" type="spawn" x="288" y="544" width="160" height="32"/>
-  <object name="mpr8" type="spawn" x="512" y="576" width="256" height="288">
-   <properties>
-    <property name="quantity" value="2"/>
-   </properties>
-  </object>
-  <object name="mpr7" type="spawn" x="480" y="576" width="288" height="288">
-   <properties>
-    <property name="quantity" value="2"/>
-   </properties>
-  </object>
-  <object name="mpr7" type="spawn" x="96" y="512" width="192" height="256">
+  <object name="charwdg2" type="spawn" x="96" y="544" width="192" height="224">
   <properties>
    <property name="quantity" value="3"/>
   </properties>
  </object>
-  <object name="mpr6" type="spawn" x="160" y="800" width="64" height="32">
+  <object name="charwdg3" type="spawn" x="160" y="800" width="64" height="32">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
  </object>
-  <object name="mpr7" type="spawn" x="160" y="864" width="64" height="32">
+  <object name="charwdg2" type="spawn" x="160" y="864" width="64" height="32">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
  </object>
+  <object name="charwdg2" type="spawn" x="736" y="256" width="128" height="192">
+   <properties>
+    <property name="quantity" value="2"/>
+   </properties>
+  </object>
+  <object name="charwdg3" type="spawn" x="576" y="448" width="32" height="32"/>
+  <object name="charwdg2" type="spawn" x="448" y="448" width="64" height="32">
+   <properties>
+    <property name="quantity" value="2"/>
+   </properties>
+  </object>
+  <object name="charwdg2" type="spawn" x="448" y="512" width="32" height="32"/>
+  <object name="charwdg2" type="spawn" x="160" y="352" width="128" height="32"/>
 </objectgroup>
 <objectgroup name="Keys" width="29" height="30"/>
 </map>
--- a/AndorsTrail/res/xml/waytominingtown0.tmx
+++ b/AndorsTrail/res/xml/waytominingtown0.tmx
@@ -1,128 +1,127 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="29" height="15" tilewidth="32" tileheight="32">
 <properties>
  <property name="outside" value="1"/>
 </properties>
 <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="576" height="192"/>
 </tileset>
 <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="576" height="192"/>
 </tileset>
 <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="576" height="192"/>
 </tileset>
 <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="480" height="256"/>
 </tileset>
 <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="480" height="256"/>
 </tileset>
 <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="512" height="256"/>
 </tileset>
 <layer name="Ground" width="29" height="15">
  <data encoding="base64" compression="zlib">
@@ -159,29 +158,32 @@
  </object>
 </objectgroup>
 <objectgroup name="Spawn" width="29" height="15">
-  <object name="forestserpent2" type="spawn" x="32" y="256" width="256" height="160">
+  <object name="redft1" type="spawn" x="640" y="320" width="32" height="64">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
  </object>
-  <object name="forestboar3" type="spawn" x="128" y="96" width="224" height="192">
+  <object name="redft1" type="spawn" x="704" y="96" width="192" height="128">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
  </object>
-  <object name="forestenxadir1" type="spawn" x="352" y="96" width="128" height="256">
+  <object name="redft2" type="spawn" x="672" y="256" width="192" height="160">
+   <properties>
+    <property name="quantity" value="1"/>
+   </properties>
+  </object>
+  <object name="forestfox2" type="spawn" x="416" y="224" width="192" height="128">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
  </object>
-  <object name="forestboar3" type="spawn" x="480" y="256" width="192" height="128">
+  <object name="redft1" type="spawn" x="192" y="128" width="192" height="128">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
  </object>
-  <object name="forestenxadir1" type="spawn" x="704" y="96" width="192" height="192"/>
-  <object name="forestserpent2" type="spawn" x="672" y="96" width="224" height="192"/>
-  <object name="forestenxadir1" type="spawn" x="672" y="288" width="224" height="128">
+  <object name="forestfox2" type="spawn" x="64" y="256" width="224" height="160">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
--- a/AndorsTrail/res/xml/waytominingtown1.tmx
+++ b/AndorsTrail/res/xml/waytominingtown1.tmx
@@ -1,128 +1,127 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="30" height="30" tilewidth="32" tileheight="32">
 <properties>
  <property name="outside" value="1"/>
 </properties>
 <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="576" height="192"/>
 </tileset>
 <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="576" height="192"/>
 </tileset>
 <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="576" height="192"/>
 </tileset>
 <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="480" height="256"/>
 </tileset>
 <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="480" height="256"/>
 </tileset>
 <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="512" height="256"/>
 </tileset>
 <layer name="Ground" width="30" height="30">
  <data encoding="base64" compression="zlib">
@@ -175,55 +174,44 @@
    <property name="place" value="west"/>
   </properties>
  </object>
+  <object name="sign_waytominto1" type="sign" x="160" y="768" width="32" height="32"/>
 </objectgroup>
- <objectgroup name="Spawn" width="30" height="30" visible="0">
-  <object name="forestboar3" type="spawn" x="32" y="736" width="128" height="192"/>
-  <object name="forestenxadir2" type="spawn" x="128" y="544" width="256" height="192">
+ <objectgroup name="Spawn" width="30" height="30">
+  <object name="redft2" type="spawn" x="576" y="128" width="320" height="192">
   <properties>
    <property name="quantity" value="3"/>
   </properties>
  </object>
-  <object name="forestenxadir1" type="spawn" x="160" y="736" width="256" height="128">
-   <properties>
-    <property name="quantity" value="3"/>
-   </properties>
-  </object>
-  <object name="forestenxadir2" type="spawn" x="416" y="704" width="288" height="224">
+  <object name="redft2" type="spawn" x="288" y="384" width="160" height="96">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
  </object>
-  <object name="forestenxadir1" type="spawn" x="384" y="704" width="320" height="224"/>
-  <object name="forestenxadir2" type="spawn" x="704" y="640" width="224" height="224">
-   <properties>
-    <property name="quantity" value="2"/>
-   </properties>
-  </object>
-  <object name="forestenxadir1" type="spawn" x="224" y="352" width="224" height="192">
-   <properties>
-    <property name="quantity" value="3"/>
-   </properties>
-  </object>
-  <object name="mushroom1" type="spawn" x="96" y="160" width="256" height="192"/>
-  <object name="forestenxadir2" type="spawn" x="64" y="160" width="416" height="192">
+  <object name="redft1" type="spawn" x="96" y="160" width="448" height="192">
   <properties>
    <property name="quantity" value="4"/>
   </properties>
  </object>
-  <object name="nuskur" type="spawn" x="544" y="224" width="32" height="32"/>
-  <object name="mushroom1" type="spawn" x="576" y="128" width="352" height="192">
+  <object name="redft1" type="spawn" x="448" y="384" width="480" height="256">
+   <properties>
+    <property name="quantity" value="4"/>
+   </properties>
+  </object>
+  <object name="redft2" type="spawn" x="736" y="768" width="32" height="64">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
  </object>
-  <object name="forestenxadir2" type="spawn" x="672" y="320" width="192" height="96"/>
-  <object name="mushroom1" type="spawn" x="704" y="384" width="224" height="160">
+  <object name="redft1" type="spawn" x="352" y="736" width="192" height="128">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
  </object>
-  <object name="mushroom2" type="spawn" x="448" y="544" width="128" height="96"/>
-  <object name="forestenxadir2" type="spawn" x="512" y="416" width="320" height="224"/>
+  <object name="redft1" type="spawn" x="128" y="512" width="288" height="224">
+   <properties>
+    <property name="quantity" value="3"/>
+   </properties>
+  </object>
 </objectgroup>
 <objectgroup name="Keys" width="30" height="30"/>
 </map>
--- a/AndorsTrail/res/xml/waytominingtown1a.tmx
+++ b/AndorsTrail/res/xml/waytominingtown1a.tmx
@@ -1,128 +1,127 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="19" height="12" tilewidth="32" tileheight="32">
 <properties>
  <property name="outside" value="1"/>
 </properties>
 <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="576" height="192"/>
 </tileset>
 <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="576" height="192"/>
 </tileset>
 <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="576" height="192"/>
 </tileset>
 <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="480" height="256"/>
 </tileset>
 <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="480" height="256"/>
 </tileset>
 <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="512" height="256"/>
 </tileset>
 <layer name="Ground" width="19" height="12">
  <data encoding="base64" compression="zlib">
@@ -153,16 +152,10 @@
  </object>
 </objectgroup>
 <objectgroup name="Spawn" width="19" height="12">
-  <object name="mushroom2" type="spawn" x="160" y="320" width="96" height="32"/>
-  <object name="mushroom1" type="spawn" x="64" y="96" width="224" height="224">
-   <properties>
-    <property name="quantity" value="2"/>
-   </properties>
-  </object>
-  <object name="forestenxadir2" type="spawn" x="32" y="96" width="256" height="224"/>
-  <object name="outlaw_1" type="spawn" x="352" y="160" width="32" height="32"/>
-  <object name="outlaw_2" type="spawn" x="352" y="192" width="224" height="128"/>
-  <object name="outlaw_3" type="spawn" x="320" y="192" width="256" height="128"/>
+  <object name="redft1" type="spawn" x="64" y="96" width="160" height="192"/>
+  <object name="askyl" type="spawn" x="544" y="192" width="32" height="32"/>
+  <object name="esfiume" type="spawn" x="448" y="224" width="32" height="32"/>
+  <object name="erethori" type="spawn" x="352" y="160" width="32" height="32"/>
 </objectgroup>
 <objectgroup name="Keys" width="19" height="12"/>
 </map>
--- a/AndorsTrail/res/xml/waytominingtown2.tmx
+++ b/AndorsTrail/res/xml/waytominingtown2.tmx
@@ -1,128 +1,127 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="19" height="20" tilewidth="32" tileheight="32">
 <properties>
  <property name="outside" value="1"/>
 </properties>
 <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="576" height="192"/>
 </tileset>
 <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="576" height="192"/>
 </tileset>
 <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="576" height="192"/>
 </tileset>
 <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="480" height="256"/>
 </tileset>
 <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="480" height="256"/>
 </tileset>
 <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="512" height="256"/>
 </tileset>
 <layer name="Ground" width="19" height="20">
  <data encoding="base64" compression="zlib">
@@ -164,6 +163,9 @@
   </properties>
  </object>
 </objectgroup>
- <objectgroup name="Spawn" width="19" height="20"/>
+ <objectgroup name="Spawn" width="19" height="20">
+  <object name="charwd_guard" type="spawn" x="512" y="224" width="32" height="32"/>
+  <object name="forestfox2" type="spawn" x="96" y="128" width="96" height="96"/>
+ </objectgroup>
 <objectgroup name="Keys" width="19" height="20"/>
 </map>
--- a/AndorsTrail/res/xml/waytominingtown3.tmx
+++ b/AndorsTrail/res/xml/waytominingtown3.tmx
@@ -1,128 +1,127 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="30" height="30" tilewidth="32" tileheight="32">
 <properties>
  <property name="outside" value="1"/>
 </properties>
 <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="576" height="192"/>
 </tileset>
 <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="576" height="192"/>
 </tileset>
 <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="576" height="192"/>
 </tileset>
 <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="480" height="256"/>
 </tileset>
 <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="480" height="256"/>
 </tileset>
 <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="512" height="256"/>
 </tileset>
 <layer name="Ground" width="30" height="30">
  <data encoding="base64" compression="zlib">
@@ -131,7 +130,7 @@
 </layer>
 <layer name="Objects" width="30" height="30">
  <data encoding="base64" compression="zlib">
-   eJyVVsuKE0EU7c5SKtDBxSxkvmDyF+PKwR8QXKog6M4BP0Fmp6D4+J/ZuHIzkAdpNRDIy8zMSvPAOql7rdN3qpPxQqhOd/V9nHvuqV4UWXblf41WWHO/zly2tbvNLBv46438z1phH2zi771qhutr2j934f3zItxbGP+6qi+9dyn71/7dT7nEyKs+cond1XyykBue432sF0V9TKz2mfqEvclD3ku/thshRzzv+BivpdajRtxva7jht7W73pULcYAb8j7269QFDEr/uy8xR0U19qiIuWF9Rv9LV60xVe+YfD/39x7U/F5I3JLw/uyxeS99eVrEvtk4XC9iag3A8lER6lQeqY2JR9gDLqFm7csH05cjutaV87gUH2on/v8fF/mj+2CKx0kR9x+40Bfl+UZw6xHnYN8S9aqhx/BZmpgceyJ7li6+A+sabH7fiXUCox/+naGr9h7WFp48LtIxOUfdc9qs9qLvr/NmVjH0feyiPjAGiImedYW/qdlAzIfS+7Gr+mY8UAdm4Z73+b0Ga/hCP+aCHfrSSWCMfZhd9XfYiPmnetESDXuXxzhf84D11OTMPbMzDwMefcr/sJHd5InEQG5c55YHPu5HmTXVxL6LHGWes0bi+YR48dPF2BoLBsz4vYno0UJm7UxiPmnEeus0T5/Dd1kE7rAuXwp+K1eNWRKXrkgjtEfo3T4eKx7o3XZWDcb/cJX61+Rf91rd68r5VhdzLH1Q35jHc4oxIPxhS+G0mtarnBoSt+rOEVjpYh/U94XogOryrzzo9Fz4o9xpG/7tWi2nwBXWRtVCNj0PNnlYv4heg1f9Gk3YdX7mpMl87qKeqamJZyl1ptl5q9On0kUN0zlC7LdSUy8P89CXfmmOqtUj6alqqWI5k3uLRC5rOvdgyvcD4hC4c0rfA2vBH3qa0lI+d/lMhI2lH9w/1bFd3wM8H/pNaHtnuWPPm2uaO723pvwnhOPK1NUVvU/1sI5DHeoF8IWevKS6GZdZYgYrOWfU21asN6WFsGPSIph+R+zjfR03bX9TewbMy1bUqn2zBy7YfXi3K9+it6kXBh/DBB9TZ56uwGVm9BJ+esSxfRilYlm9hm2/oQQf/abXeUjlXKeJdX2zeg0bmllhW7i0v9toJOe0K7f/Wf8CHxuUyQ==
+   eJyVVk1rE1EUnclSXmCGLrqQ/oL2X9SVpX+g0KUKgu4s+BPEnYLix//pxpWbQpOQUQOFSROTdqVtiu/k3dt35vZNUi+EN5l5cz/OPfe8mRVZduF/nTKsuV8nLlvaRjfLhv76Rv5nZdgH2/N7X3XD9SXtn7rw/nER7s2Mf13Vl96by/6Ff/dzHq7HedMHcjv0a0/zyUJueI73sZ4U7TGx2md5GX29yUPeV37d6YQc8fzUx3gttW534n5bwx2/5ep6r12IA9yQ965fz13AoPK/RxLzrGjGPitiblif0f/KNWtM1VuT7+f+3uOW3wuJWxHeXzw2H6QvT4vYNxuH60VMrQFYHhShzmWPyXdNPMIecAk1a18+mr5s07WunMdcfKiBs39d5I/ugykee0Xcv+lCX5TnN4JbnzgH+56oVw09hs/KxOTYY9lz5eI7sJ7B5s+DWCcw+unfGblm72E7wpPDIh2Tc9Q9R91mLwb+Ou9mDUPfaxf1gTFAzAOZzYXLkrOBmPvS+9o1fTMeqAOz8ND7/NGCNXyhH1PBDn05TWCMfZhd9bfVifmnelGKhr3PY5xvecD63OTMPbMzDwMeA8p/q5Pd5YnEQG5c55IHPu4nmTXVxIGLHGWes0bi+Zh48cvF2BoLBsz4vbHo0Uxm7a3EfNKJ9bZpnj6H76oI3GFdngt+164ZsyIuXZBGaI/Qu3U8VjzQu+WsGoxvcZX6F+Rf91rdA4/hqy1mLX1Q35jHY4oxJPxhV8JpNa1XOTUibrWdI7DKxT6o7xPRAdXl33nQ6anwR7mzY/i3arWcAldYG1UL2fQ8uMnD+lX0GrwatGjCqvMzJ03mcxf1nJuaeJYU733JF5yz89amT5WLGqZzhNjvpKZ+HuZhIP3SHFWrz6SnqqWK5UTuMabMR9iG+FK+bxKHwJ0j+h5YCP6oMaWlfO7ymQirpR/cP9WxVd8DPB/6TWh7Z7ljz5tLmju9t6D8x4TjtamrJ3qf6mEbh06pF8AXevKS6mZcJi59/5Lu3/a2jPWmtBC2S1oE0++Idbxv46btb2rPkHlZRq1aN3vggt2Hd3vyLXqfemHwMUrwMXXm6QpcJkYv4adPHFuHUSqW1WvY8htK8NFvep2HVM5tmtjWN6vXsJGZFbaZS/u7j0ZyTqty+5/1HypTlSQ=
  </data>
 </layer>
 <layer name="Above" width="30" height="30">
@@ -158,42 +157,42 @@
   </properties>
  </object>
 </objectgroup>
- <objectgroup name="Spawn" width="30" height="30" visible="0">
-  <object name="mushroom2" type="spawn" x="480" y="864" width="96" height="64"/>
-  <object name="forestenxadir3" type="spawn" x="32" y="256" width="256" height="288">
+ <objectgroup name="Spawn" width="30" height="30">
+  <object name="redft_cr" type="spawn" x="480" y="864" width="96" height="64"/>
+  <object name="redft2" type="spawn" x="64" y="352" width="256" height="192">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
  </object>
-  <object name="mpr1" type="spawn" x="128" y="96" width="256" height="352">
+  <object name="redft2" type="spawn" x="128" y="192" width="192" height="160">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
  </object>
-  <object name="forestenxadir3" type="spawn" x="352" y="96" width="288" height="256">
+  <object name="ccentip" type="spawn" x="352" y="96" width="288" height="256">
+   <properties>
+    <property name="quantity" value="2"/>
+   </properties>
+  </object>
+  <object name="redft2" type="spawn" x="640" y="192" width="192" height="160"/>
+  <object name="redft2" type="spawn" x="416" y="448" width="32" height="32"/>
+  <object name="redft2" type="spawn" x="160" y="576" width="320" height="320">
   <properties>
    <property name="quantity" value="3"/>
   </properties>
  </object>
-  <object name="mpr1" type="spawn" x="640" y="192" width="192" height="160"/>
-  <object name="mpr1" type="spawn" x="288" y="352" width="192" height="256"/>
-  <object name="forestenxadir3" type="spawn" x="160" y="608" width="320" height="288">
-   <properties>
-    <property name="quantity" value="3"/>
-   </properties>
-  </object>
-  <object name="mpr1" type="spawn" x="480" y="608" width="224" height="160">
+  <object name="redft1" type="spawn" x="480" y="608" width="224" height="160">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
  </object>
-  <object name="forestenxadir3" type="spawn" x="704" y="544" width="224" height="224">
+  <object name="redft2" type="spawn" x="704" y="544" width="224" height="224">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
  </object>
-  <object name="forestenxadir3" type="spawn" x="800" y="800" width="128" height="96"/>
-  <object name="mpr1" type="spawn" x="640" y="800" width="128" height="128"/>
+  <object name="redft1" type="spawn" x="800" y="800" width="128" height="96"/>
+  <object name="redft1" type="spawn" x="640" y="800" width="128" height="128"/>
 </objectgroup>
 <objectgroup name="Keys" width="30" height="30"/>
 </map>
--- a/AndorsTrail/res/xml/woodhouse0.tmx
+++ b/AndorsTrail/res/xml/woodhouse0.tmx
@@ -1,125 +1,124 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="12" height="8" tilewidth="32" tileheight="32">
 <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="576" height="192"/>
 </tileset>
 <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="576" height="192"/>
 </tileset>
 <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="576" height="192"/>
 </tileset>
 <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="480" height="256"/>
 </tileset>
 <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="480" height="256"/>
 </tileset>
 <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="512" height="256"/>
 </tileset>
 <layer name="Ground" width="12" height="8">
  <data encoding="base64" compression="zlib">
@@ -150,7 +149,7 @@
  </object>
 </objectgroup>
 <objectgroup name="Spawn" width="12" height="8">
-  <object name="dornas" type="spawn" x="64" y="96" width="288" height="128"/>
+  <object name="smuggler5" type="spawn" x="128" y="96" width="128" height="64"/>
 </objectgroup>
 <objectgroup name="Keys" width="12" height="8"/>
 </map>
--- a/AndorsTrail/res/xml/woodhouse1.tmx
+++ b/AndorsTrail/res/xml/woodhouse1.tmx
@@ -1,125 +1,124 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="12" height="8" tilewidth="32" tileheight="32">
 <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="576" height="192"/>
 </tileset>
 <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="576" height="192"/>
 </tileset>
 <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="576" height="192"/>
 </tileset>
 <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="480" height="256"/>
 </tileset>
 <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="480" height="256"/>
 </tileset>
 <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="512" height="256"/>
 </tileset>
 <layer name="Ground" width="12" height="8">
  <data encoding="base64" compression="zlib">
@@ -150,7 +149,8 @@
  </object>
 </objectgroup>
 <objectgroup name="Spawn" width="12" height="8">
-  <object name="smuggler" type="spawn" x="32" y="128" width="320" height="96"/>
+  <object name="smuggler4" type="spawn" x="192" y="128" width="160" height="64"/>
+  <object name="twoteeth" type="spawn" x="64" y="128" width="32" height="32"/>
 </objectgroup>
 <objectgroup name="Keys" width="12" height="8"/>
 </map>
--- a/AndorsTrail/res/xml/woodhouse2.tmx
+++ b/AndorsTrail/res/xml/woodhouse2.tmx
@@ -1,125 +1,124 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="16" height="8" tilewidth="32" tileheight="32">
 <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="576" height="192"/>
 </tileset>
 <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="576" height="192"/>
 </tileset>
 <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="576" height="192"/>
 </tileset>
 <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="480" height="256"/>
 </tileset>
 <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="480" height="256"/>
 </tileset>
 <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="512" height="256"/>
 </tileset>
 <layer name="Ground" width="16" height="8">
  <data encoding="base64" compression="zlib">
@@ -128,7 +127,7 @@
 </layer>
 <layer name="Objects" width="16" height="8">
  <data encoding="base64" compression="zlib">
-   eJxjYKAcMHMzMLAA8V4hBobfXAwMxlD2LEaIPIi9Bii2HioOAiu5Mc05C5TrBOpx5oawQeAMK4INkgOxTwPF5jAi9P0E2unNDMEwdSAA4t9hRah7xwahbyOJwdSxCjAwsAtA2DMZEWIg/WXcEFwKxK95sOtXBapVF0C4AURbAPlvgGrbuCG4Fern12j6Yephel/xQOg3PAj5Ul4E+xWSOKUAAH2yItc=
+   eJxjYKAcMHMzMLAA8V4hBobfXAwMxlD2LEaIPIi9Bii2HioOAiu5Mc05C5TrBOpx5oawQeAMK4INkgOxTwPF5jAi9P0E2unNDMEwdSAA4t9hRah7xwahbyOJwdSxCjAwsAtA2DMZITSHAER/GTcElwLxax7s+lWBatUFEG4A0RpA/hug2jZuCG6F+vk1mn6YepjeVzwQ+g0PQr6UF8F+hSROKQAAdh4iyg==
  </data>
 </layer>
 <layer name="Above" width="16" height="8">
@@ -155,12 +154,15 @@
   </properties>
  </object>
 </objectgroup>
- <objectgroup name="Spawn" width="16" height="8" visible="0">
-  <object name="wood_drunk" type="spawn" x="224" y="96" width="32" height="32"/>
-  <object name="wood_guest_1" type="spawn" x="32" y="96" width="128" height="32"/>
-  <object name="wood_guest_2" type="spawn" x="32" y="128" width="96" height="96"/>
-  <object name="wood_guest_3" type="spawn" x="128" y="96" width="96" height="128"/>
-  <object name="tavern_owner_wood" type="spawn" x="288" y="96" width="128" height="32"/>
+ <objectgroup name="Spawn" width="16" height="8">
+  <object name="smuggler1" type="spawn" x="32" y="96" width="96" height="96"/>
+  <object name="smuggler2" type="spawn" x="128" y="96" width="96" height="128"/>
+  <object name="lowyna" type="spawn" x="288" y="96" width="96" height="32"/>
+  <object name="vermin" type="spawn" x="32" y="192" width="96" height="32">
+   <properties>
+    <property name="quantity" value="2"/>
+   </properties>
+  </object>
 </objectgroup>
- <objectgroup name="Keys" width="16" height="8" visible="0"/>
+ <objectgroup name="Keys" width="16" height="8"/>
 </map>
--- a/AndorsTrail/res/xml/woodhouse3.tmx
+++ b/AndorsTrail/res/xml/woodhouse3.tmx
@@ -1,125 +1,124 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="16" height="8" tilewidth="32" tileheight="32">
 <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="576" height="192"/>
 </tileset>
 <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="576" height="192"/>
 </tileset>
 <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="576" height="192"/>
 </tileset>
 <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="480" height="256"/>
 </tileset>
 <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="480" height="256"/>
 </tileset>
 <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="512" height="256"/>
 </tileset>
 <layer name="Ground" width="16" height="8">
  <data encoding="base64" compression="zlib">
@@ -149,13 +148,17 @@
   </properties>
  </object>
 </objectgroup>
- <objectgroup name="Spawn" width="16" height="8" visible="0">
-  <object name="beetle2" type="spawn" x="320" y="96" width="128" height="128">
+ <objectgroup name="Spawn" width="16" height="8">
+  <object name="vermin" type="spawn" x="256" y="96" width="160" height="128">
   <properties>
    <property name="quantity" value="2"/>
   </properties>
  </object>
-  <object name="wood_guest_4" type="spawn" x="64" y="96" width="32" height="32"/>
+  <object name="smuggler7" type="spawn" x="64" y="96" width="32" height="32"/>
+  <object name="rest1" type="rest" x="32" y="128" width="32" height="32"/>
+  <object name="rest2" type="rest" x="96" y="128" width="32" height="32"/>
+  <object name="rest3" type="rest" x="160" y="128" width="32" height="32"/>
+  <object name="rest4" type="rest" x="224" y="128" width="32" height="32"/>
 </objectgroup>
- <objectgroup name="Keys" width="16" height="8" visible="0"/>
+ <objectgroup name="Keys" width="16" height="8"/>
 </map>
--- a/Show More
+++ b/Show More