From a71e0c767bfdb96c2ca7ba18b844ad61e9bb9da4 Mon Sep 17 00:00:00 2001
From: HoraK-FDF <horak-fdf@web.de>
Date: Sat, 8 Apr 2023 02:18:02 +0000
Subject: map fixes

---
 graphics/minimaps/002-1.png            | Bin 16556 -> 14942 bytes
 graphics/minimaps/004-1.png            | Bin 11441 -> 11343 bytes
 graphics/minimaps/008-1.png            | Bin 24663 -> 47576 bytes
 graphics/minimaps/009-1.png            | Bin 10567 -> 10574 bytes
 graphics/minimaps/015-1.png            | Bin 37345 -> 48096 bytes
 graphics/minimaps/018-1.png            | Bin 20214 -> 45174 bytes
 graphics/minimaps/030-4.png            | Bin 876 -> 872 bytes
 graphics/minimaps/041-1.png            | Bin 10186 -> 9361 bytes
 graphics/minimaps/042-1.png            | Bin 13967 -> 13264 bytes
 graphics/minimaps/047-1.png            | Bin 44202 -> 38167 bytes
 maps/001-1.tmx                         |  48 ++++++-------
 maps/002-1.tmx                         |  72 +++++++++----------
 maps/003-4.tmx                         |  32 ++++-----
 maps/004-1.tmx                         |  62 ++++++++---------
 maps/006-1.tmx                         | 124 ++++++++++++++++-----------------
 maps/008-1.tmx                         |  74 ++++++++++----------
 maps/009-1.tmx                         |  62 ++++++++---------
 maps/015-1.tmx                         |  42 +++++------
 maps/017-2.tmx                         |  22 +++---
 maps/018-1.tmx                         | 104 +++++++++++++--------------
 maps/023-3.tmx                         |  50 ++++++-------
 maps/025-4.tmx                         | 104 +++++++++++++--------------
 maps/026-1.tmx                         |  48 ++++++-------
 maps/030-4.tmx                         |  28 ++++----
 maps/041-1.tmx                         |  50 ++++++-------
 maps/042-1.tmx                         |  48 ++++++-------
 maps/047-1.tmx                         |  98 +++++++++++++-------------
 tilesets/woodland_village_x2_to_1x.tsx |   4 ++
 tilesets/woodland_x3_to_1x.tsx         |   4 ++
 29 files changed, 543 insertions(+), 533 deletions(-)
 create mode 100644 tilesets/woodland_village_x2_to_1x.tsx
 create mode 100644 tilesets/woodland_x3_to_1x.tsx

diff --git a/graphics/minimaps/002-1.png b/graphics/minimaps/002-1.png
index 882ab481..fd1a5097 100644
Binary files a/graphics/minimaps/002-1.png and b/graphics/minimaps/002-1.png differ
diff --git a/graphics/minimaps/004-1.png b/graphics/minimaps/004-1.png
index 70e5337a..f380134d 100644
Binary files a/graphics/minimaps/004-1.png and b/graphics/minimaps/004-1.png differ
diff --git a/graphics/minimaps/008-1.png b/graphics/minimaps/008-1.png
index 7bd3fe0a..05538347 100644
Binary files a/graphics/minimaps/008-1.png and b/graphics/minimaps/008-1.png differ
diff --git a/graphics/minimaps/009-1.png b/graphics/minimaps/009-1.png
index 2df74ddb..a9515387 100644
Binary files a/graphics/minimaps/009-1.png and b/graphics/minimaps/009-1.png differ
diff --git a/graphics/minimaps/015-1.png b/graphics/minimaps/015-1.png
index eeefbc93..2a45a009 100644
Binary files a/graphics/minimaps/015-1.png and b/graphics/minimaps/015-1.png differ
diff --git a/graphics/minimaps/018-1.png b/graphics/minimaps/018-1.png
index 9551395a..f5db0731 100644
Binary files a/graphics/minimaps/018-1.png and b/graphics/minimaps/018-1.png differ
diff --git a/graphics/minimaps/030-4.png b/graphics/minimaps/030-4.png
index 4adc15c7..5a907c8d 100644
Binary files a/graphics/minimaps/030-4.png and b/graphics/minimaps/030-4.png differ
diff --git a/graphics/minimaps/041-1.png b/graphics/minimaps/041-1.png
index 72f89efd..e718db72 100644
Binary files a/graphics/minimaps/041-1.png and b/graphics/minimaps/041-1.png differ
diff --git a/graphics/minimaps/042-1.png b/graphics/minimaps/042-1.png
index b96f7443..7063ef44 100644
Binary files a/graphics/minimaps/042-1.png and b/graphics/minimaps/042-1.png differ
diff --git a/graphics/minimaps/047-1.png b/graphics/minimaps/047-1.png
index 2e778ba5..c1a4015e 100644
Binary files a/graphics/minimaps/047-1.png and b/graphics/minimaps/047-1.png differ
diff --git a/maps/001-1.tmx b/maps/001-1.tmx
index adceb3c0..2b7b584e 100644
--- a/maps/001-1.tmx
+++ b/maps/001-1.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.4" tiledversion="1.4.3" orientation="orthogonal" renderorder="right-down" width="140" height="140" tilewidth="32" tileheight="32" infinite="0" nextlayerid="11" nextobjectid="103">
+<map version="1.9" tiledversion="1.9.2" orientation="orthogonal" renderorder="right-down" width="140" height="140" tilewidth="32" tileheight="32" infinite="0" nextlayerid="11" nextobjectid="103">
  <properties>
   <property name="minimap" value="graphics/minimaps/001-1.png"/>
   <property name="music" value="faith.ogg"/>
@@ -188,7 +188,7 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1225,300,300,300,0,0,0,0,0,0,0,0,300,300,300,1227,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1681,1676,1705,914,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1257,0,0,0,1257,0,0,0,0,0,0,1259,0,0,0,1259,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1695,1690,898,913,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1237,1238,1226,1239,1240,0,0,0,85,86,86,89,86,86,86,89,89,86,86,86,89,89,1241,1242,1242,1242,1257,1381,1382,0,0,1383,1384,1259,1242,1242,1242,1242,86,86,86,86,89,86,89,86,86,86,86,86,86,86,90,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1695,1690,914,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1285,1286,1306,1287,1288,0,0,0,101,0,0,0,0,0,0,0,0,0,0,0,0,0,1257,0,0,0,0,1439,0,0,0,0,1439,0,0,0,0,1259,49,202,80,80,79,80,80,80,79,80,80,79,80,186,106,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1029,1051,1031,1051,1051,1031,1051,1051,1031,1051,1051,1031,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1695,1690,914,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1285,1286,1306,1287,1288,0,0,0,101,0,0,0,0,0,0,0,0,0,0,0,0,0,1257,0,0,0,0,1439,0,0,0,0,1439,0,0,0,0,1259,49,202,80,80,79,80,80,80,79,80,80,79,80,186,106,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1029,1051,1031,1051,1051,1031,1051,1051,1031,1051,1051,1031,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1695,1690,914,0,0,0,0,0,0,0,11,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1301,1302,0,1303,1304,0,0,0,101,0,0,0,0,0,0,0,0,0,0,0,0,0,1257,0,0,0,1454,1455,1456,0,0,1454,1455,1456,0,0,0,1259,0,107,0,0,0,0,0,0,0,0,0,0,0,107,106,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1004,1005,1006,1004,1005,1006,1004,1005,1006,1004,1005,1006,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1681,1676,1705,914,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,101,0,0,0,0,0,0,0,0,0,0,0,0,0,1257,0,0,0,1305,1471,1472,0,0,1470,1471,1307,0,0,0,1259,0,107,0,0,0,0,0,0,0,0,0,0,0,107,106,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1020,1021,1022,1020,1021,1022,1020,1021,1022,1020,1021,1022,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1681,1676,1705,898,913,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,88,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1257,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1259,0,107,0,0,0,941,942,943,0,0,0,0,0,107,106,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1036,1037,1038,1036,1037,1038,1036,1037,1038,1036,1037,1038,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1681,1676,1705,898,913,0,0,0,0,0,0,0,0,0,0,
@@ -332,7 +332,7 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1259,0,0,0,0,40,0,0,0,0,0,0,0,35,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,524,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1110,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,11,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1110,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,994,0,0,0,0,0,0,0,0,0,0,996,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,595,596,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1470,1471,1472,0,0,1470,1471,1472,0,0,0,0,0,0,0,0,56,0,0,0,36,0,0,0,0,0,35,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,994,0,716,0,0,0,0,0,0,0,0,996,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,85,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,938,939,940,0,32,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1110,1013,713,716,0,0,0,0,0,1079,0,0,996,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -1318,22 +1318,22 @@
 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2
 </data>
  </layer>
- <objectgroup id="10" name="Objects">
-  <object id="3" name="South Tulimshar" type="warp" x="1952" y="3808" width="160" height="32">
+ <objectgroup id="10" name="Objects" visible="0">
+  <object id="3" name="South Tulimshar" class="warp" x="1952" y="3808" width="160" height="32">
    <properties>
     <property name="dest_map" value="002-1"/>
     <property name="dest_tile_x" value="63"/>
     <property name="dest_tile_y" value="21"/>
    </properties>
   </object>
-  <object id="4" name="South Tulimshar" type="warp" x="3232" y="3808" width="160" height="32">
+  <object id="4" name="South Tulimshar" class="warp" x="3232" y="3808" width="160" height="32">
    <properties>
     <property name="dest_map" value="002-1"/>
     <property name="dest_tile_x" value="103"/>
     <property name="dest_tile_y" value="21"/>
    </properties>
   </object>
-  <object id="27" name="GreenSlime" type="spawn" x="864" y="1728" width="352" height="384">
+  <object id="27" name="GreenSlime" class="spawn" x="864" y="1728" width="352" height="384">
    <properties>
     <property name="eA_death" value="30000"/>
     <property name="eA_spawn" value="100000"/>
@@ -1341,7 +1341,7 @@
     <property name="monster_id" value="3"/>
    </properties>
   </object>
-  <object id="29" name="GreenSlime" type="spawn" x="1280" y="3040" width="352" height="384">
+  <object id="29" name="GreenSlime" class="spawn" x="1280" y="3040" width="352" height="384">
    <properties>
     <property name="eA_death" value="30000"/>
     <property name="eA_spawn" value="100000"/>
@@ -1349,7 +1349,7 @@
     <property name="monster_id" value="3"/>
    </properties>
   </object>
-  <object id="34" name="SeaSlime" type="spawn" x="1056" y="1856" width="288" height="1120">
+  <object id="34" name="SeaSlime" class="spawn" x="1056" y="1856" width="288" height="1120">
    <properties>
     <property name="eA_death" value="30000"/>
     <property name="eA_spawn" value="100000"/>
@@ -1357,7 +1357,7 @@
     <property name="monster_id" value="31"/>
    </properties>
   </object>
-  <object id="40" name="Maggot" type="spawn" x="1728" y="1824" width="2112" height="1792">
+  <object id="40" name="Maggot" class="spawn" x="1728" y="1824" width="2112" height="1792">
    <properties>
     <property name="eA_death" value="30000"/>
     <property name="eA_spawn" value="100000"/>
@@ -1365,7 +1365,7 @@
     <property name="monster_id" value="0"/>
    </properties>
   </object>
-  <object id="41" name="SeaSlime" type="spawn" x="1728" y="1824" width="2112" height="1792">
+  <object id="41" name="SeaSlime" class="spawn" x="1728" y="1824" width="2112" height="1792">
    <properties>
     <property name="eA_death" value="30000"/>
     <property name="eA_spawn" value="100000"/>
@@ -1373,85 +1373,85 @@
     <property name="monster_id" value="31"/>
    </properties>
   </object>
-  <object id="51" name="To Government Building" type="warp" x="1760" y="2272" width="32" height="32">
+  <object id="51" name="To Government Building" class="warp" x="1760" y="2272" width="32" height="32">
    <properties>
     <property name="dest_map" value="001-2"/>
     <property name="dest_tile_x" value="31"/>
     <property name="dest_tile_y" value="27"/>
    </properties>
   </object>
-  <object id="52" name="To Government Building" type="warp" x="1664" y="2272" width="32" height="32">
+  <object id="52" name="To Government Building" class="warp" x="1664" y="2272" width="32" height="32">
    <properties>
     <property name="dest_map" value="001-2"/>
     <property name="dest_tile_x" value="28"/>
     <property name="dest_tile_y" value="27"/>
    </properties>
   </object>
-  <object id="53" name="To Government Building" type="warp" x="1568" y="2272" width="32" height="32">
+  <object id="53" name="To Government Building" class="warp" x="1568" y="2272" width="32" height="32">
    <properties>
     <property name="dest_map" value="001-2"/>
     <property name="dest_tile_x" value="25"/>
     <property name="dest_tile_y" value="27"/>
    </properties>
   </object>
-  <object id="54" name="To Tulimshar Forge" type="warp" x="3648" y="3168" width="32" height="32">
+  <object id="54" name="To Tulimshar Forge" class="warp" x="3648" y="3168" width="32" height="32">
    <properties>
     <property name="dest_map" value="001-2"/>
     <property name="dest_tile_x" value="25"/>
     <property name="dest_tile_y" value="64"/>
    </properties>
   </object>
-  <object id="58" name="To MIT" type="warp" x="864" y="1024" width="32" height="32">
+  <object id="58" name="To MIT" class="warp" x="864" y="1024" width="32" height="32">
    <properties>
     <property name="dest_map" value="001-2"/>
     <property name="dest_tile_x" value="28"/>
     <property name="dest_tile_y" value="101"/>
    </properties>
   </object>
-  <object id="60" name="graphics/particles/magic-building-aura.particle.xml" type="particle_effect" x="2208" y="768" width="32" height="32"/>
-  <object id="95" name="To MIT" type="warp" x="1184" y="1024" width="32" height="32">
+  <object id="60" name="graphics/particles/magic-building-aura.particle.xml" class="particle_effect" x="2208" y="768" width="32" height="32"/>
+  <object id="95" name="To MIT" class="warp" x="1184" y="1024" width="32" height="32">
    <properties>
     <property name="dest_map" value="001-2"/>
     <property name="dest_tile_x" value="71"/>
     <property name="dest_tile_y" value="101"/>
    </properties>
   </object>
-  <object id="96" name="To Tulimshar Castle" type="warp" x="1728" y="1088" width="64" height="32">
+  <object id="96" name="To Tulimshar Castle" class="warp" x="1728" y="1088" width="64" height="32">
    <properties>
     <property name="dest_map" value="001-2"/>
     <property name="dest_tile_x" value="104"/>
     <property name="dest_tile_y" value="101"/>
    </properties>
   </object>
-  <object id="97" name="Council Chambers" type="warp" x="1664" y="704" width="32" height="32">
+  <object id="97" name="Council Chambers" class="warp" x="1664" y="704" width="32" height="32">
    <properties>
     <property name="dest_map" value="001-2"/>
     <property name="dest_tile_x" value="95"/>
     <property name="dest_tile_y" value="52"/>
    </properties>
   </object>
-  <object id="98" name="Council Chambers" type="warp" x="1824" y="704" width="32" height="32">
+  <object id="98" name="Council Chambers" class="warp" x="1824" y="704" width="32" height="32">
    <properties>
     <property name="dest_map" value="001-2"/>
     <property name="dest_tile_x" value="114"/>
     <property name="dest_tile_y" value="52"/>
    </properties>
   </object>
-  <object id="99" name="To MIT" type="warp" x="896" y="736" width="32" height="32">
+  <object id="99" name="To MIT" class="warp" x="896" y="736" width="32" height="32">
    <properties>
     <property name="dest_map" value="001-2"/>
     <property name="dest_tile_x" value="28"/>
     <property name="dest_tile_y" value="87"/>
    </properties>
   </object>
-  <object id="101" name="Sewers" type="warp" x="896" y="1408" width="32" height="32">
+  <object id="101" name="Sewers" class="warp" x="896" y="1408" width="32" height="32">
    <properties>
     <property name="dest_map" value="021-3"/>
     <property name="dest_tile_x" value="29"/>
     <property name="dest_tile_y" value="61"/>
    </properties>
   </object>
-  <object id="102" name="To Bank" type="warp" x="1888" y="3136" width="32" height="32">
+  <object id="102" name="To Bank" class="warp" x="1888" y="3136" width="32" height="32">
    <properties>
     <property name="dest_map" value="001-2"/>
     <property name="dest_tile_x" value="65"/>
diff --git a/maps/002-1.tmx b/maps/002-1.tmx
index db56eea3..b9ba217d 100644
--- a/maps/002-1.tmx
+++ b/maps/002-1.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.4" tiledversion="1.4.3" orientation="orthogonal" renderorder="right-down" width="140" height="140" tilewidth="32" tileheight="32" infinite="0" nextlayerid="11" nextobjectid="30">
+<map version="1.9" tiledversion="1.9.2" orientation="orthogonal" renderorder="right-down" width="140" height="140" tilewidth="32" tileheight="32" infinite="0" nextlayerid="11" nextobjectid="30">
  <properties>
   <property name="minimap" value="graphics/minimaps/002-1.png"/>
   <property name="music" value="faith.ogg"/>
@@ -142,7 +142,7 @@
 1431,1431,1431,1431,1431,1431,1431,1431,1431,1431,1431,1431,1431,1431,1431,3,3,3,3,3,3,3,3,3,3,3,3,3,3,120,136,137,424,425,153,154,442,442,442,442,442,442,442,442,442,442,442,442,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,442,3,3,3,3,3,3,3,428,428,428,428,428,428,414,3,3,3,3,490,491,492,3,3,474,475,475,475,475,476,3,3,3,3,3,3,3,3,3,3,3,166,151,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,
 1431,1431,1431,1431,1431,1431,1431,1431,1431,1431,1431,1431,1431,1431,3,3,3,3,3,3,3,3,3,3,3,3,3,3,120,136,152,153,440,441,169,500,435,436,436,436,436,436,437,442,442,442,442,442,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,442,3,3,3,3,442,3,3,3,3,3,3,3,412,428,428,428,428,428,430,3,3,3,3,3,442,442,3,3,3,3,475,475,476,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,
 1431,1431,1431,1431,1431,1431,1431,1431,1431,1431,1431,1431,1431,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,136,152,168,169,442,485,500,442,451,452,452,452,452,452,453,442,442,442,442,442,3,3,3,3,3,3,3,3,395,395,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,442,3,3,352,353,354,3,412,412,428,445,428,444,446,3,3,137,9,3,3,442,442,501,3,3,3,474,475,476,3,3,442,442,442,442,3,3,3,442,442,442,442,149,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,
-1431,1431,1431,1431,1431,1431,1431,1431,1431,1431,1431,1431,1431,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,152,168,6,7,442,485,442,3,451,452,452,452,452,452,453,442,442,442,442,442,3,3,3,3,3,3,3,3,3,396,397,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,442,3,3,368,369,427,412,412,428,428,444,446,151,3,120,121,3,459,459,3,442,484,3,3,3,342,343,343,344,3,3,442,442,64,63,3,3,3,442,442,442,63,165,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,
+1431,1431,1431,1431,1431,1431,1431,1431,1431,1431,1431,1431,1431,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,152,168,6,7,442,485,442,3,451,452,452,452,452,452,453,442,442,442,442,442,3,3,3,3,3,3,3,3,3,396,397,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,442,3,3,368,369,427,412,412,428,428,444,446,151,3,120,121,3,459,459,3,442,484,3,3,3,342,343,343,344,3,3,3,442,64,63,3,3,3,442,442,442,63,165,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,
 1431,1431,1431,1431,1431,1431,1431,1431,1431,1431,1431,1431,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,168,3,3,66,442,485,500,3,451,452,452,452,452,452,453,3,3,3,352,353,354,3,3,3,3,411,395,395,395,428,428,414,137,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,442,383,384,385,442,427,444,412,442,442,3,3,120,136,409,3,475,475,476,442,484,442,3,3,358,359,359,360,3,3,64,62,442,442,3,3,3,61,442,61,442,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,
 1431,1431,1431,1431,1431,1431,1431,1431,1431,1431,1431,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,442,442,442,442,442,442,442,451,452,452,452,452,452,453,3,3,3,368,369,3,3,3,3,3,446,411,395,428,428,430,3,3,396,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,399,400,401,3,3,427,412,3,3,3,3,136,152,425,154,475,475,475,459,459,442,3,3,358,359,390,376,3,3,64,442,442,442,3,3,3,442,442,442,442,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,
 1431,1431,1431,1431,1431,1431,1431,1431,1431,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,442,442,442,442,442,442,442,467,468,468,468,468,468,469,3,3,383,384,385,3,3,3,443,446,428,411,446,428,428,430,3,429,396,414,3,3,3,3,3,3,3,3,3,3,9,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,152,168,441,170,491,491,475,475,476,442,501,501,374,375,376,3,3,3,442,442,64,442,3,3,3,442,442,442,62,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,
@@ -306,7 +306,7 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,564,565,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,522,0,0,0,0,0,0,0,56,0,0,0,49,0,0,0,0,0,0,0,19,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,40,0,0,0,0,0,0,0,0,0,0,0,0,522,0,0,0,0,0,0,0,0,0,0,564,565,0,0,0,0,0,25,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,564,565,0,0,0,0,0,0,0,0,0,523,0,0,0,0,0,0,25,564,565,0,0,524,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,564,565,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,19,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,564,565,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,564,565,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,564,565,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,522,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,523,0,0,0,0,0,0,0,564,565,0,0,524,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,564,565,0,0,0,0,0,0,0,0,0,0,0,0,0,564,565,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,523,0,0,0,0,0,0,0,564,565,0,0,524,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,564,565,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,564,565,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,564,565,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,522,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,564,565,0,0,0,0,0,0,0,0,0,0,0,0,564,565,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,564,565,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,564,565,0,0,41,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,41,0,0,0,0,0,0,0,564,565,0,0,0,56,0,0,564,565,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,522,0,0,0,0,0,0,0,0,0,523,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,524,0,0,0,0,0,0,47,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,35,0,0,0,522,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,564,565,0,0,46,0,0,0,
@@ -450,7 +450,7 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,564,565,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -1292,9 +1292,9 @@
 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,0,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,0,0,0,0,0,0,2,2,2,2,2,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,2,0,2,2,2,2,2,2,2,2,2,0,0,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,0,0,0,0,2,2,0,0,2,2,2,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,2,2,0,2,2,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
-2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,0,0,0,0,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
+2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,0,0,0,0,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,0,0,2,2,0,0,0,0,0,0,0,2,2,2,2,2,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
-2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,2,0,0,2,2,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
+2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,2,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,0,2,0,0,0,0,0,0,2,2,0,0,0,0,0,0,0,0,0,0,2,0,2,2,2,2,2,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,2,0,0,0,0,0,0,2,2,0,0,0,0,0,2,2,2,2,2,0,0,0,2,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,2,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,0,0,0,0,0,2,2,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,2,0,0,0,0,0,0,0,2,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
@@ -1324,22 +1324,22 @@
 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2
 </data>
  </layer>
- <objectgroup id="10" name="Objects">
-  <object id="1" name="North Tulimshar" type="warp" x="1952" y="640" width="160" height="32">
+ <objectgroup id="10" name="Objects" visible="0">
+  <object id="1" name="North Tulimshar" class="warp" x="1952" y="640" width="160" height="32">
    <properties>
     <property name="dest_map" value="001-1"/>
     <property name="dest_tile_x" value="63"/>
     <property name="dest_tile_y" value="118"/>
    </properties>
   </object>
-  <object id="2" name="North Tulimshar" type="warp" x="3232" y="640" width="160" height="32">
+  <object id="2" name="North Tulimshar" class="warp" x="3232" y="640" width="160" height="32">
    <properties>
     <property name="dest_map" value="001-1"/>
     <property name="dest_tile_x" value="103"/>
     <property name="dest_tile_y" value="118"/>
    </properties>
   </object>
-  <object id="3" name="Maggot" type="spawn" x="2592" y="1856" width="800" height="320">
+  <object id="3" name="Maggot" class="spawn" x="2592" y="1856" width="800" height="320">
    <properties>
     <property name="eA_death" value="30000"/>
     <property name="eA_spawn" value="100000"/>
@@ -1347,7 +1347,7 @@
     <property name="monster_id" value="0"/>
    </properties>
   </object>
-  <object id="4" name="Maggot" type="spawn" x="3424" y="1856" width="384" height="320">
+  <object id="4" name="Maggot" class="spawn" x="3424" y="1856" width="384" height="320">
    <properties>
     <property name="eA_death" value="30000"/>
     <property name="eA_spawn" value="100000"/>
@@ -1355,7 +1355,7 @@
     <property name="monster_id" value="0"/>
    </properties>
   </object>
-  <object id="5" name="Maggot" type="spawn" x="3296" y="2208" width="384" height="320">
+  <object id="5" name="Maggot" class="spawn" x="3296" y="2208" width="384" height="320">
    <properties>
     <property name="eA_death" value="30000"/>
     <property name="eA_spawn" value="100000"/>
@@ -1363,7 +1363,7 @@
     <property name="monster_id" value="0"/>
    </properties>
   </object>
-  <object id="6" name="Maggot" type="spawn" x="1952" y="672" width="128" height="512">
+  <object id="6" name="Maggot" class="spawn" x="1952" y="672" width="128" height="512">
    <properties>
     <property name="eA_death" value="30000"/>
     <property name="eA_spawn" value="100000"/>
@@ -1371,7 +1371,7 @@
     <property name="monster_id" value="0"/>
    </properties>
   </object>
-  <object id="7" name="Scorpion" type="spawn" x="1984" y="2560" width="800" height="1088">
+  <object id="7" name="Scorpion" class="spawn" x="1984" y="2560" width="800" height="1088">
    <properties>
     <property name="eA_death" value="30000"/>
     <property name="eA_spawn" value="100000"/>
@@ -1379,7 +1379,7 @@
     <property name="monster_id" value="1"/>
    </properties>
   </object>
-  <object id="8" name="Maggot" type="spawn" x="3456" y="3552" width="352" height="256">
+  <object id="8" name="Maggot" class="spawn" x="3456" y="3552" width="352" height="256">
    <properties>
     <property name="eA_death" value="30000"/>
     <property name="eA_spawn" value="100000"/>
@@ -1387,7 +1387,7 @@
     <property name="monster_id" value="0"/>
    </properties>
   </object>
-  <object id="9" name="Scorpion" type="spawn" x="1216" y="832" width="352" height="2272">
+  <object id="9" name="Scorpion" class="spawn" x="1216" y="832" width="352" height="2272">
    <properties>
     <property name="eA_death" value="30000"/>
     <property name="eA_spawn" value="100000"/>
@@ -1395,7 +1395,7 @@
     <property name="monster_id" value="1"/>
    </properties>
   </object>
-  <object id="10" name="Scorpion" type="spawn" x="1472" y="2656" width="1600" height="640">
+  <object id="10" name="Scorpion" class="spawn" x="1472" y="2656" width="1600" height="640">
    <properties>
     <property name="eA_death" value="30000"/>
     <property name="eA_spawn" value="100000"/>
@@ -1403,7 +1403,7 @@
     <property name="monster_id" value="1"/>
    </properties>
   </object>
-  <object id="11" name="RedScorpion" type="spawn" x="992" y="2656" width="640" height="672">
+  <object id="11" name="RedScorpion" class="spawn" x="992" y="2656" width="640" height="672">
    <properties>
     <property name="eA_death" value="30000"/>
     <property name="eA_spawn" value="100000"/>
@@ -1411,7 +1411,7 @@
     <property name="monster_id" value="2"/>
    </properties>
   </object>
-  <object id="12" name="SeaSlime" type="spawn" x="1216" y="832" width="288" height="960">
+  <object id="12" name="SeaSlime" class="spawn" x="1216" y="832" width="288" height="960">
    <properties>
     <property name="eA_death" value="30000"/>
     <property name="eA_spawn" value="100000"/>
@@ -1419,7 +1419,7 @@
     <property name="monster_id" value="31"/>
    </properties>
   </object>
-  <object id="13" name="SeaSlime" type="spawn" x="928" y="1760" width="320" height="1312">
+  <object id="13" name="SeaSlime" class="spawn" x="928" y="1760" width="320" height="1312">
    <properties>
     <property name="eA_death" value="30000"/>
     <property name="eA_spawn" value="100000"/>
@@ -1427,7 +1427,7 @@
     <property name="monster_id" value="31"/>
    </properties>
   </object>
-  <object id="14" name="Scorpion" type="spawn" x="2592" y="1856" width="1216" height="320">
+  <object id="14" name="Scorpion" class="spawn" x="2592" y="1856" width="1216" height="320">
    <properties>
     <property name="eA_death" value="30000"/>
     <property name="eA_spawn" value="100000"/>
@@ -1435,91 +1435,91 @@
     <property name="monster_id" value="1"/>
    </properties>
   </object>
-  <object id="15" name="To Snake Desert" type="warp" x="3808" y="3008" width="32" height="96">
+  <object id="15" name="To Snake Desert" class="warp" x="3808" y="3008" width="32" height="96">
    <properties>
     <property name="dest_map" value="006-1"/>
     <property name="dest_tile_x" value="21"/>
     <property name="dest_tile_y" value="47"/>
    </properties>
   </object>
-  <object id="16" name="To Desert Mine Camp" type="warp" x="2944" y="3648" width="32" height="32">
+  <object id="16" name="To Desert Mine Camp" class="warp" x="2944" y="3648" width="32" height="32">
    <properties>
     <property name="dest_map" value="002-3"/>
     <property name="dest_tile_x" value="85"/>
     <property name="dest_tile_y" value="49"/>
    </properties>
   </object>
-  <object id="17" name="To Desert Mine Camp" type="warp" x="1056" y="3488" width="32" height="32">
+  <object id="17" name="To Desert Mine Camp" class="warp" x="1056" y="3488" width="32" height="32">
    <properties>
     <property name="dest_map" value="002-3"/>
     <property name="dest_tile_x" value="51"/>
     <property name="dest_tile_y" value="35"/>
    </properties>
   </object>
-  <object id="18" name="To Weavers Shop" type="warp" x="3488" y="1440" width="32" height="32">
+  <object id="18" name="To Weavers Shop" class="warp" x="3488" y="1440" width="32" height="32">
    <properties>
     <property name="dest_map" value="002-2"/>
     <property name="dest_tile_x" value="75"/>
     <property name="dest_tile_y" value="100"/>
    </properties>
   </object>
-  <object id="19" name="To Weavers Shop" type="warp" x="3680" y="1440" width="32" height="32">
+  <object id="19" name="To Weavers Shop" class="warp" x="3680" y="1440" width="32" height="32">
    <properties>
     <property name="dest_map" value="002-2"/>
     <property name="dest_tile_x" value="83"/>
     <property name="dest_tile_y" value="100"/>
    </properties>
   </object>
-  <object id="20" name="To Jeweler" type="warp" x="3168" y="1376" width="32" height="32">
+  <object id="20" name="To Jeweler" class="warp" x="3168" y="1376" width="32" height="32">
    <properties>
     <property name="dest_map" value="002-2"/>
     <property name="dest_tile_x" value="120"/>
     <property name="dest_tile_y" value="66"/>
    </properties>
   </object>
-  <object id="21" name="To Trainer" type="warp" x="3648" y="1120" width="32" height="32">
+  <object id="21" name="To Trainer" class="warp" x="3648" y="1120" width="32" height="32">
    <properties>
     <property name="dest_map" value="002-2"/>
     <property name="dest_tile_x" value="78"/>
     <property name="dest_tile_y" value="131"/>
    </properties>
   </object>
-  <object id="22" name="To Trainer" type="warp" x="3520" y="928" width="32" height="32">
+  <object id="22" name="To Trainer" class="warp" x="3520" y="928" width="32" height="32">
    <properties>
     <property name="dest_map" value="002-2"/>
     <property name="dest_tile_x" value="68"/>
     <property name="dest_tile_y" value="122"/>
    </properties>
   </object>
-  <object id="23" name="To Tulimshar Indoor" type="warp" x="2336" y="1120" width="32" height="32">
+  <object id="23" name="To Tulimshar Indoor" class="warp" x="2336" y="1120" width="32" height="32">
    <properties>
     <property name="dest_map" value="002-2"/>
     <property name="dest_tile_x" value="44"/>
     <property name="dest_tile_y" value="33"/>
    </properties>
   </object>
-  <object id="24" name="To KPS" type="warp" x="1824" y="1120" width="32" height="32">
+  <object id="24" name="To KPS" class="warp" x="1824" y="1120" width="32" height="32">
    <properties>
     <property name="dest_map" value="002-2"/>
     <property name="dest_tile_x" value="120"/>
     <property name="dest_tile_y" value="94"/>
    </properties>
   </object>
-  <object id="25" name="To Tulimshar Indoor" type="warp" x="2144" y="928" width="32" height="32">
+  <object id="25" name="To Tulimshar Indoor" class="warp" x="2144" y="928" width="32" height="32">
    <properties>
     <property name="dest_map" value="002-2"/>
     <property name="dest_tile_x" value="23"/>
     <property name="dest_tile_y" value="109"/>
    </properties>
   </object>
-  <object id="26" name="To Snake Cave" type="warp" x="3616" y="3424" width="32" height="32">
+  <object id="26" name="To Snake Cave" class="warp" x="3616" y="3424" width="32" height="32">
    <properties>
     <property name="dest_map" value="005-3"/>
     <property name="dest_tile_x" value="52"/>
     <property name="dest_tile_y" value="37"/>
    </properties>
   </object>
-  <object id="27" name="FireGoblin" type="spawn" x="2016" y="3040" width="672" height="704">
+  <object id="27" name="FireGoblin" class="spawn" x="2016" y="3040" width="672" height="704">
    <properties>
     <property name="eA_death" value="30000"/>
     <property name="eA_spawn" value="100000"/>
@@ -1527,14 +1527,14 @@
     <property name="monster_id" value="1011"/>
    </properties>
   </object>
-  <object id="28" name="To Sea Cave" type="warp" x="1568" y="640" width="32" height="32">
+  <object id="28" name="To Sea Cave" class="warp" x="1568" y="640" width="32" height="32">
    <properties>
     <property name="dest_map" value="004-3"/>
     <property name="dest_tile_x" value="24"/>
     <property name="dest_tile_y" value="94"/>
    </properties>
   </object>
-  <object id="29" name="Omar's House" type="warp" x="1824" y="832" width="32" height="32">
+  <object id="29" name="Omar's House" class="warp" x="1824" y="832" width="32" height="32">
    <properties>
     <property name="dest_map" value="002-2"/>
     <property name="dest_tile_x" value="119"/>
diff --git a/maps/003-4.tmx b/maps/003-4.tmx
index 16b679f7..96a71159 100644
--- a/maps/003-4.tmx
+++ b/maps/003-4.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.2" tiledversion="1.2.2" orientation="orthogonal" renderorder="right-down" width="190" height="138" tilewidth="32" tileheight="32" infinite="0" nextlayerid="10" nextobjectid="12">
+<map version="1.9" tiledversion="1.9.2" orientation="orthogonal" renderorder="right-down" width="190" height="138" tilewidth="32" tileheight="32" infinite="0" nextlayerid="10" nextobjectid="12">
  <properties>
   <property name="minimap" value="graphics/minimaps/003-4.png"/>
   <property name="music" value="faith.ogg"/>
@@ -711,7 +711,11 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,598,599,600,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,595,596,597,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,598,599,600,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,595,596,597,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -720,13 +724,9 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,595,596,597,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,598,599,600,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 </data>
@@ -1158,21 +1158,21 @@
 </data>
  </layer>
  <objectgroup id="9" name="Objects" visible="0">
-  <object id="1" name="To Exit" type="warp" x="5504" y="2400" width="32" height="160">
+  <object id="1" name="To Exit" class="warp" x="5504" y="2400" width="32" height="160">
    <properties>
     <property name="dest_map" value="002-1"/>
     <property name="dest_tile_x" value="32"/>
     <property name="dest_tile_y" value="66"/>
    </properties>
   </object>
-  <object id="2" name="To Beach" type="warp" x="4480" y="608" width="96" height="32">
+  <object id="2" name="To Beach" class="warp" x="4480" y="608" width="96" height="32">
    <properties>
     <property name="dest_map" value="004-1"/>
     <property name="dest_tile_x" value="37"/>
     <property name="dest_tile_y" value="110"/>
    </properties>
   </object>
-  <object id="3" name="GiantMaggot" type="spawn" x="4608" y="640" width="928" height="3104">
+  <object id="3" name="GiantMaggot" class="spawn" x="4608" y="640" width="928" height="3104">
    <properties>
     <property name="eA_death" value="30000"/>
     <property name="eA_spawn" value="100000"/>
@@ -1180,7 +1180,7 @@
     <property name="monster_id" value="4"/>
    </properties>
   </object>
-  <object id="4" name="SeaSlime" type="spawn" x="0" y="0">
+  <object id="4" name="SeaSlime" class="spawn" x="0" y="0">
    <properties>
     <property name="eA_death" value="30000"/>
     <property name="eA_spawn" value="100000"/>
@@ -1188,7 +1188,7 @@
     <property name="monster_id" value="31"/>
    </properties>
   </object>
-  <object id="5" name="SeaSlime" type="spawn" x="3488" y="640" width="736" height="736">
+  <object id="5" name="SeaSlime" class="spawn" x="3488" y="640" width="736" height="736">
    <properties>
     <property name="eA_death" value="30000"/>
     <property name="eA_spawn" value="100000"/>
@@ -1196,7 +1196,7 @@
     <property name="monster_id" value="31"/>
    </properties>
   </object>
-  <object id="6" name="GreenSlime" type="spawn" x="2144" y="576" width="3392" height="3264">
+  <object id="6" name="GreenSlime" class="spawn" x="2144" y="576" width="3392" height="3264">
    <properties>
     <property name="eA_death" value="30000"/>
     <property name="eA_spawn" value="100000"/>
@@ -1204,7 +1204,7 @@
     <property name="monster_id" value="3"/>
    </properties>
   </object>
-  <object id="7" name="RedScorpion" type="spawn" x="3072" y="1088" width="2464" height="2304">
+  <object id="7" name="RedScorpion" class="spawn" x="3072" y="1088" width="2464" height="2304">
    <properties>
     <property name="eA_death" value="30000"/>
     <property name="eA_spawn" value="100000"/>
@@ -1212,7 +1212,7 @@
     <property name="monster_id" value="2"/>
    </properties>
   </object>
-  <object id="8" name="MountainSnake" type="spawn" x="960" y="768" width="352" height="128">
+  <object id="8" name="MountainSnake" class="spawn" x="960" y="768" width="352" height="128">
    <properties>
     <property name="eA_death" value="600000"/>
     <property name="eA_spawn" value="700000"/>
@@ -1220,7 +1220,7 @@
     <property name="monster_id" value="24"/>
    </properties>
   </object>
-  <object id="11" name="To Beach" type="warp" x="3584" y="3744" width="128" height="32">
+  <object id="11" name="To Beach" class="warp" x="3584" y="3744" width="128" height="32">
    <properties>
     <property name="dest_map" value="043-1"/>
     <property name="dest_tile_x" value="44"/>
diff --git a/maps/004-1.tmx b/maps/004-1.tmx
index 88d71a3c..1fcd2e42 100644
--- a/maps/004-1.tmx
+++ b/maps/004-1.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.0" tiledversion="1.1.4" orientation="orthogonal" renderorder="right-down" width="117" height="133" tilewidth="32" tileheight="32" infinite="0" nextobjectid="14">
+<map version="1.9" tiledversion="1.9.2" orientation="orthogonal" renderorder="right-down" width="117" height="133" tilewidth="32" tileheight="32" infinite="0" nextlayerid="10" nextobjectid="14">
  <properties>
   <property name="minimap" value="graphics/minimaps/004-1.png"/>
   <property name="music" value="faith.ogg"/>
@@ -18,7 +18,7 @@
  <tileset firstgid="1137" source="../tilesets/water.tsx"/>
  <tileset firstgid="1302" source="../tilesets/waterflow.tsx"/>
  <tileset firstgid="1374" source="../tilesets/signs_x2.tsx"/>
- <layer name="Ground1" width="117" height="133">
+ <layer id="1" name="Ground1" width="117" height="133">
   <data encoding="csv">
 1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1300,1297,1271,3,150,118,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,358,359,360,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,71,3,3,213,217,3,3,3,3,3,3,3,403,404,405,3,3,725,676,677,725,725,774,725,
 1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1300,1300,1282,3,150,134,118,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,358,359,360,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,10,3,3,213,217,3,648,647,648,647,648,3,403,404,405,3,3,3,3,3,3,474,475,475,
@@ -110,9 +110,9 @@
 1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1300,1282,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,484,485,3,3,232,230,404,438,389,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,403,404,404,404,404,404,
 1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1300,1297,1271,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,484,485,3,3,248,246,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,439,404,404,404,404,404,
 1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1300,1300,1297,1298,1271,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,484,485,3,3,332,332,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,404,404,404,404,404,404,
-1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1300,1300,1300,1282,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,484,485,213,217,364,347,348,348,348,348,348,348,348,348,348,348,348,348,348,348,348,348,348,348,348,348,3,404,404,404,404,404,404,
-1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1300,1282,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,118,3,3,3,3,3,3,3,3,3,3,3,3,3,62,3,3,3,3,3,3,3,120,135,135,135,3,484,485,213,217,364,363,364,364,364,364,364,364,364,364,364,364,364,364,364,364,364,364,364,364,364,364,3,403,404,404,404,404,404,
-1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1300,1300,1282,3,3,3,3,3,3,3,3,3,3,3,118,10,120,121,3,3,3,3,3,3,3,3,134,118,3,474,475,476,3,3,3,3,3,120,121,135,135,135,118,3,3,3,65,120,136,151,151,151,3,484,485,213,217,3,3,459,459,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,403,404,404,404,404,404,
+1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1300,1300,1300,1282,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,484,485,213,217,348,348,348,348,348,348,348,348,348,348,348,348,348,348,348,348,348,348,348,348,348,348,3,404,404,404,404,404,404,
+1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1300,1282,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,118,3,3,3,3,3,3,3,3,3,3,3,3,3,62,3,3,3,3,3,3,3,120,135,135,135,3,484,485,213,217,364,364,364,364,364,364,364,364,364,364,364,364,364,364,364,364,364,364,364,364,364,364,3,403,404,404,404,404,404,
+1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1300,1300,1282,3,3,3,3,3,3,3,3,3,3,3,118,10,120,121,3,3,3,3,3,3,3,3,134,118,3,474,475,476,3,3,3,3,3,120,121,135,135,135,118,3,3,3,65,120,136,151,151,151,3,484,485,213,217,459,459,459,459,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,403,404,404,404,404,404,
 1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1300,1267,1286,3,3,3,3,3,3,3,3,3,3,3,134,135,136,137,3,3,3,3,352,353,354,149,150,134,3,490,491,492,3,120,121,38,135,136,137,151,151,151,134,135,135,38,135,136,152,167,167,167,154,484,485,213,217,3,3,474,475,476,460,3,3,3,3,3,3,3,3,3,3,3,3,442,442,442,3,3,403,404,404,404,404,404,
 1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1300,1282,3,3,3,3,3,3,3,3,3,3,3,149,150,151,152,153,154,3,3,367,368,369,3,165,166,150,3,3,3,392,393,136,137,54,151,152,153,167,167,167,150,151,151,54,151,152,168,3,3,3,3,484,485,213,217,3,3,474,475,475,476,3,3,3,3,3,3,3,3,3,3,3,3,442,442,459,459,459,403,404,404,404,404,404,
 1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1300,1300,1300,1282,3,3,3,3,3,3,3,3,3,3,3,165,166,167,168,169,3,3,3,383,384,385,3,3,3,166,38,135,135,408,409,152,153,70,167,168,169,3,3,3,166,167,167,70,167,168,3,3,3,3,3,3,485,213,217,3,3,490,491,491,492,3,3,3,648,650,648,781,690,706,689,688,782,3,442,474,475,476,403,404,404,404,404,404,
@@ -155,7 +155,7 @@
 1310,1310,1310,1310,1310,1310,1300,1282,3,3,3,3,3,3,3,3,3,3,63,3,3,3,458,459,474,475,476,3,458,459,460,3,352,353,354,3,3,3,3,396,397,430,3,3,3,3,3,3,3,150,150,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,442,442,442,442,3,3,3,459,459,3,3,490,491,491,3,3,444,446,443,430,3,396,396,397,429,414,412,412,445,3,3,3,368,369,3,484,3,3,3,3,3,403,404,404,404,404,404
 </data>
  </layer>
- <layer name="Ground2" width="117" height="133">
+ <layer id="2" name="Ground2" width="117" height="133">
   <data encoding="csv">
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1279,1274,1010,977,133,117,0,0,0,0,0,0,0,0,0,0,0,0,0,105,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,102,0,0,0,0,0,0,104,0,0,0,0,0,0,0,0,0,0,0,0,565,0,606,0,675,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1280,1275,1259,994,133,133,0,0,0,0,0,0,0,0,0,0,0,0,0,106,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,101,0,0,0,0,0,0,105,0,0,0,0,0,707,0,0,0,0,0,708,565,0,606,0,691,692,692,693,692,692,692,692,
@@ -247,9 +247,9 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1279,1274,994,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1279,1274,1010,977,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,102,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,106,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1280,1275,1259,1010,1011,977,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,101,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,106,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1280,1275,1258,1259,994,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,102,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,106,0,0,0,0,346,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,339,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1280,1264,1274,994,0,0,0,0,0,0,0,0,0,0,101,0,0,0,0,106,0,0,0,0,0,0,117,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,122,0,0,0,0,362,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,355,356,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1265,1260,1289,994,0,0,0,0,0,0,0,0,0,0,117,0,0,0,0,122,0,0,0,0,0,0,133,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,138,0,0,0,0,378,379,380,380,380,380,380,380,380,380,380,380,380,380,380,380,380,380,380,380,380,380,371,372,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1280,1275,1258,1259,994,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,102,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,106,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,339,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1280,1264,1274,994,0,0,0,0,0,0,0,0,0,0,101,0,0,0,0,106,0,0,0,0,0,0,117,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,122,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,355,356,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1265,1260,1289,994,0,0,0,0,0,0,0,0,0,0,117,0,0,0,0,122,0,0,0,0,0,0,133,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,138,0,0,0,0,380,380,380,380,380,380,380,380,380,380,380,380,380,380,380,380,380,380,380,380,380,380,371,372,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1279,1274,978,993,0,0,0,0,0,0,0,0,0,0,133,0,0,0,0,138,0,0,0,0,0,0,0,0,102,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1265,1294,1274,994,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,101,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1265,1260,1288,1289,994,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,37,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,723,0,0,0,0,0,0,0,0,0,724,0,0,0,0,0,0,0,0,0,934,
@@ -292,7 +292,7 @@
 0,0,0,0,0,1279,1274,994,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,149,133,101,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 </data>
  </layer>
- <layer name="Ground3" width="117" height="133">
+ <layer id="3" name="Ground3" width="117" height="133">
   <data encoding="csv">
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1376,0,0,0,
@@ -429,7 +429,7 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 </data>
  </layer>
- <layer name="Ground4" width="117" height="133">
+ <layer id="4" name="Ground4" width="117" height="133">
   <data encoding="csv">
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1393,0,0,0,
@@ -566,7 +566,7 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 </data>
  </layer>
- <layer name="Fringe" width="117" height="133">
+ <layer id="5" name="Fringe" width="117" height="133">
   <data encoding="csv">
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -598,8 +598,8 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,934,935,936,0,0,0,0,0,0,0,0,0,0,0,0,0,0,931,932,933,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,522,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,523,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,934,935,936,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,934,935,936,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,931,932,515,516,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,934,935,936,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,515,516,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,931,932,933,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,934,935,936,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,934,935,936,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,934,935,936,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,934,935,936,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -662,7 +662,7 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,517,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,931,932,933,0,0,0,0,0,0,0,0,0,0,0,935,936,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,931,932,933,0,0,0,0,0,0,0,0,0,0,934,935,936,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,931,932,933,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,934,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,934,935,936,0,0,0,0,0,0,0,0,934,935,936,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,931,932,933,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,900,901,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -683,7 +683,7 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,931,932,933,0,0,0,0,0,0,0,0,0,934,935,936,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,931,932,933,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,931,932,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,931,932,933,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,934,935,936,0,0,0,0,0,0,0,0,0,0,0,0,521,0,0,0,521,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,934,935,936,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,934,935,936,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,931,932,933,0,0,0,0,0,0,0,0,0,0,0,
@@ -703,7 +703,7 @@
 0,0,0,0,0,0,934,935,936,0,0,0,934,935,936,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,521,0,0,0,521
 </data>
  </layer>
- <layer name="Over1" width="117" height="133">
+ <layer id="6" name="Over1" width="117" height="133">
   <data encoding="csv">
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,643,644,644,644,645,645,646,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -840,7 +840,7 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,90,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 </data>
  </layer>
- <layer name="Over2" width="117" height="133">
+ <layer id="7" name="Over2" width="117" height="133">
   <data encoding="csv">
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -977,7 +977,7 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 </data>
  </layer>
- <layer name="Collision" width="117" height="133">
+ <layer id="8" name="Collision" width="117" height="133" visible="0">
   <data encoding="csv">
 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
@@ -1009,8 +1009,8 @@
 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,2,2,2,2,2,2,2,2,2,2,2,2,2,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
-2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,2,2,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
-2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,2,2,2,2,2,2,2,2,2,2,2,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
+2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
+2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,2,0,2,2,2,2,2,2,2,2,2,2,2,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
@@ -1114,8 +1114,8 @@
 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2
 </data>
  </layer>
- <objectgroup name="Objects" visible="0">
-  <object id="1" name="SeaSlime" type="spawn" x="1120" y="1376" width="288" height="960">
+ <objectgroup id="9" name="Objects" visible="0">
+  <object id="1" name="SeaSlime" class="spawn" x="1120" y="1376" width="288" height="960">
    <properties>
     <property name="eA_death" value="30000"/>
     <property name="eA_spawn" value="100000"/>
@@ -1123,7 +1123,7 @@
     <property name="monster_id" value="31"/>
    </properties>
   </object>
-  <object id="2" name="SeaSlime" type="spawn" x="928" y="2016" width="320" height="1312">
+  <object id="2" name="SeaSlime" class="spawn" x="928" y="2016" width="320" height="1312">
    <properties>
     <property name="eA_death" value="30000"/>
     <property name="eA_spawn" value="100000"/>
@@ -1131,7 +1131,7 @@
     <property name="monster_id" value="31"/>
    </properties>
   </object>
-  <object id="3" name="SeaSlime" type="spawn" x="736" y="3072" width="384" height="480">
+  <object id="3" name="SeaSlime" class="spawn" x="736" y="3072" width="384" height="480">
    <properties>
     <property name="eA_death" value="30000"/>
     <property name="eA_spawn" value="100000"/>
@@ -1139,7 +1139,7 @@
     <property name="monster_id" value="31"/>
    </properties>
   </object>
-  <object id="4" name="GiantMaggot" type="spawn" x="1856" y="3008" width="896" height="672">
+  <object id="4" name="GiantMaggot" class="spawn" x="1856" y="3008" width="896" height="672">
    <properties>
     <property name="eA_death" value="30000"/>
     <property name="eA_spawn" value="100000"/>
@@ -1147,7 +1147,7 @@
     <property name="monster_id" value="4"/>
    </properties>
   </object>
-  <object id="5" name="RedScorpion" type="spawn" x="2112" y="1408" width="704" height="1600">
+  <object id="5" name="RedScorpion" class="spawn" x="2112" y="1408" width="704" height="1600">
    <properties>
     <property name="eA_death" value="30000"/>
     <property name="eA_spawn" value="100000"/>
@@ -1155,7 +1155,7 @@
     <property name="monster_id" value="2"/>
    </properties>
   </object>
-  <object id="6" name="GiantMaggot" type="Spawn" x="1888" y="640" width="640" height="352">
+  <object id="6" name="GiantMaggot" class="Spawn" x="1888" y="640" width="640" height="352">
    <properties>
     <property name="eA_death" value="30000"/>
     <property name="eA_spawn" value="100000"/>
@@ -1163,7 +1163,7 @@
     <property name="monster_id" value="4"/>
    </properties>
   </object>
-  <object id="7" name="BlackScorpion" type="spawn" x="2944" y="832" width="96" height="128">
+  <object id="7" name="BlackScorpion" class="spawn" x="2944" y="832" width="96" height="128">
    <properties>
     <property name="eA_death" value="60000"/>
     <property name="eA_spawn" value="120000"/>
@@ -1171,14 +1171,14 @@
     <property name="monster_id" value="7"/>
    </properties>
   </object>
-  <object id="12" name="To Beach" type="warp" x="2144" y="608" width="96" height="32">
+  <object id="12" name="To Beach" class="warp" x="2144" y="608" width="96" height="32">
    <properties>
     <property name="dest_map" value="041-1"/>
     <property name="dest_tile_x" value="101"/>
     <property name="dest_tile_y" value="94"/>
    </properties>
   </object>
-  <object id="13" name="To Beach" type="warp" x="1152" y="3552" width="96" height="32">
+  <object id="13" name="To Beach" class="warp" x="1152" y="3552" width="96" height="32">
    <properties>
     <property name="dest_map" value="003-4"/>
     <property name="dest_tile_x" value="141"/>
diff --git a/maps/006-1.tmx b/maps/006-1.tmx
index ad879505..e5895f22 100644
--- a/maps/006-1.tmx
+++ b/maps/006-1.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.0" orientation="orthogonal" renderorder="right-down" width="140" height="140" tilewidth="32" tileheight="32">
+<map version="1.9" tiledversion="1.9.2" orientation="orthogonal" renderorder="right-down" width="140" height="140" tilewidth="32" tileheight="32" infinite="0" nextlayerid="9" nextobjectid="52">
  <properties>
   <property name="minimap" value="graphics/minimaps/006-1.png"/>
   <property name="music" value="faith.ogg"/>
@@ -12,7 +12,7 @@
  <tileset firstgid="563" source="../tilesets/desert_x3.tsx"/>
  <tileset firstgid="595" source="../tilesets/docks.tsx"/>
  <tileset firstgid="755" source="../tilesets/trans_woodland_desert.tsx"/>
- <layer name="Ground1" width="140" height="140">
+ <layer id="1" name="Ground1" width="140" height="140">
   <data encoding="csv">
 3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,134,118,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,150,150,134,118,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,
 3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,149,150,134,135,135,118,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,134,118,3,3,3,3,3,3,3,166,150,150,134,118,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,
@@ -156,7 +156,7 @@
 3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,120,136,152,151,152,168,3,3,3,3,3,3,3,3,120,136,152,168,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3
 </data>
  </layer>
- <layer name="Ground2" width="140" height="140">
+ <layer id="2" name="Ground2" width="140" height="140">
   <data encoding="csv">
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,564,565,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,50,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,35,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,564,565,0,0,0,523,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,523,0,0,0,0,0,0,0,0,0,0,0,524,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -170,7 +170,7 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,564,565,0,0,0,0,523,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,564,565,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,564,565,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,564,565,0,0,524,0,564,565,0,0,0,0,0,0,0,0,0,0,0,48,0,0,0,0,0,0,0,0,0,0,0,0,0,36,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,564,565,0,0,0,0,0,0,0,0,0,0,0,0,0,564,565,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,46,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,46,0,0,0,0,0,0,0,0,564,565,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,522,0,0,0,0,0,0,0,47,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,564,565,0,0,0,0,0,0,0,0,0,0,0,0,0,0,564,565,0,0,41,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,523,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,564,565,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,41,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,523,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,564,565,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,524,0,0,0,0,0,0,47,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,564,35,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,47,0,0,0,0,0,0,0,0,0,524,0,564,565,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,61,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,46,0,0,0,0,522,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,57,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,564,565,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -300,7 +300,7 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 </data>
  </layer>
- <layer name="Ground3" width="140" height="140">
+ <layer id="3" name="Ground3" width="140" height="140">
   <data encoding="csv">
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -314,7 +314,7 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,564,565,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -444,7 +444,7 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 </data>
  </layer>
- <layer name="Fringe" width="140" height="140">
+ <layer id="4" name="Fringe" width="140" height="140">
   <data encoding="csv">
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,133,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,101,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,101,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,88,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -588,7 +588,7 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 </data>
  </layer>
- <layer name="Over1" width="140" height="140">
+ <layer id="5" name="Over1" width="140" height="140">
   <data encoding="csv">
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -732,7 +732,7 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,101,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 </data>
  </layer>
- <layer name="Over2" width="140" height="140">
+ <layer id="6" name="Over2" width="140" height="140">
   <data encoding="csv">
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -876,7 +876,7 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 </data>
  </layer>
- <layer name="Collision" width="140" height="140">
+ <layer id="7" name="Collision" width="140" height="140">
   <data encoding="csv">
 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
@@ -1020,141 +1020,141 @@
 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2
 </data>
  </layer>
- <objectgroup name="Objects" visible="0">
-  <object name="To Desert Mountain Cave" type="warp" x="1280" y="832" width="32" height="32">
+ <objectgroup id="8" name="Objects" visible="0">
+  <object id="1" name="To Desert Mountain Cave" class="warp" x="1280" y="832" width="32" height="32">
    <properties>
     <property name="dest_map" value="006-3"/>
     <property name="dest_tile_x" value="40"/>
     <property name="dest_tile_y" value="28"/>
    </properties>
   </object>
-  <object name="To Desert Mountain Cave" type="warp" x="1920" y="1856" width="32" height="32">
+  <object id="2" name="To Desert Mountain Cave" class="warp" x="1920" y="1856" width="32" height="32">
    <properties>
     <property name="dest_map" value="006-3"/>
     <property name="dest_tile_x" value="60"/>
     <property name="dest_tile_y" value="70"/>
    </properties>
   </object>
-  <object name="To Desert Mountain Cave" type="warp" x="1984" y="960" width="32" height="32">
+  <object id="3" name="To Desert Mountain Cave" class="warp" x="1984" y="960" width="32" height="32">
    <properties>
     <property name="dest_map" value="006-3"/>
     <property name="dest_tile_x" value="62"/>
     <property name="dest_tile_y" value="32"/>
    </properties>
   </object>
-  <object name="To Desert Mountain Cave" type="warp" x="1760" y="864" width="32" height="32">
+  <object id="4" name="To Desert Mountain Cave" class="warp" x="1760" y="864" width="32" height="32">
    <properties>
     <property name="dest_map" value="006-3"/>
     <property name="dest_tile_x" value="55"/>
     <property name="dest_tile_y" value="29"/>
    </properties>
   </object>
-  <object name="To Desert Mountain Cave" type="warp" x="2464" y="1408" width="32" height="32">
+  <object id="5" name="To Desert Mountain Cave" class="warp" x="2464" y="1408" width="32" height="32">
    <properties>
     <property name="dest_map" value="006-3"/>
     <property name="dest_tile_x" value="77"/>
     <property name="dest_tile_y" value="46"/>
    </properties>
   </object>
-  <object name="To Desert Mountain Cave" type="warp" x="2752" y="768" width="32" height="32">
+  <object id="6" name="To Desert Mountain Cave" class="warp" x="2752" y="768" width="32" height="32">
    <properties>
     <property name="dest_map" value="006-3"/>
     <property name="dest_tile_x" value="86"/>
     <property name="dest_tile_y" value="26"/>
    </properties>
   </object>
-  <object name="To Desert Mountain Cave" type="warp" x="2912" y="768" width="32" height="32">
+  <object id="7" name="To Desert Mountain Cave" class="warp" x="2912" y="768" width="32" height="32">
    <properties>
     <property name="dest_map" value="006-3"/>
     <property name="dest_tile_x" value="91"/>
     <property name="dest_tile_y" value="26"/>
    </properties>
   </object>
-  <object name="To Desert Mountain Cave" type="warp" x="3136" y="1472" width="32" height="32">
+  <object id="8" name="To Desert Mountain Cave" class="warp" x="3136" y="1472" width="32" height="32">
    <properties>
     <property name="dest_map" value="006-3"/>
     <property name="dest_tile_x" value="104"/>
     <property name="dest_tile_y" value="46"/>
    </properties>
   </object>
-  <object name="To Desert Mountain Cave" type="warp" x="3648" y="704" width="32" height="32">
+  <object id="9" name="To Desert Mountain Cave" class="warp" x="3648" y="704" width="32" height="32">
    <properties>
     <property name="dest_map" value="006-3"/>
     <property name="dest_tile_x" value="122"/>
     <property name="dest_tile_y" value="26"/>
    </properties>
   </object>
-  <object name="To Desert Mountain Cave" type="warp" x="3648" y="1568" width="32" height="32">
+  <object id="10" name="To Desert Mountain Cave" class="warp" x="3648" y="1568" width="32" height="32">
    <properties>
     <property name="dest_map" value="006-3"/>
     <property name="dest_tile_x" value="114"/>
     <property name="dest_tile_y" value="51"/>
    </properties>
   </object>
-  <object name="To Desert Mountain Cave" type="warp" x="3264" y="1696" width="32" height="32">
+  <object id="11" name="To Desert Mountain Cave" class="warp" x="3264" y="1696" width="32" height="32">
    <properties>
     <property name="dest_map" value="006-3"/>
     <property name="dest_tile_x" value="110"/>
     <property name="dest_tile_y" value="58"/>
    </properties>
   </object>
-  <object name="To Desert Mountain Cave" type="warp" x="3744" y="1824" width="32" height="32">
+  <object id="12" name="To Desert Mountain Cave" class="warp" x="3744" y="1824" width="32" height="32">
    <properties>
     <property name="dest_map" value="006-3"/>
     <property name="dest_tile_x" value="125"/>
     <property name="dest_tile_y" value="61"/>
    </properties>
   </object>
-  <object name="To Desert Mountain Cave" type="warp" x="2944" y="2016" width="32" height="32">
+  <object id="13" name="To Desert Mountain Cave" class="warp" x="2944" y="2016" width="32" height="32">
    <properties>
     <property name="dest_map" value="006-3"/>
     <property name="dest_tile_x" value="92"/>
     <property name="dest_tile_y" value="65"/>
    </properties>
   </object>
-  <object name="To Desert Mountain Cave" type="warp" x="3584" y="2368" width="32" height="32">
+  <object id="14" name="To Desert Mountain Cave" class="warp" x="3584" y="2368" width="32" height="32">
    <properties>
     <property name="dest_map" value="006-3"/>
     <property name="dest_tile_x" value="112"/>
     <property name="dest_tile_y" value="76"/>
    </properties>
   </object>
-  <object name="To Desert Mountain Cave" type="warp" x="3552" y="3520" width="32" height="32">
+  <object id="15" name="To Desert Mountain Cave" class="warp" x="3552" y="3520" width="32" height="32">
    <properties>
     <property name="dest_map" value="032-3"/>
     <property name="dest_tile_x" value="56"/>
     <property name="dest_tile_y" value="60"/>
    </properties>
   </object>
-  <object name="To Desert Mountain Cave" type="warp" x="2656" y="3744" width="32" height="32">
+  <object id="16" name="To Desert Mountain Cave" class="warp" x="2656" y="3744" width="32" height="32">
    <properties>
     <property name="dest_map" value="006-3"/>
     <property name="dest_tile_x" value="79"/>
     <property name="dest_tile_y" value="121"/>
    </properties>
   </object>
-  <object name="To Desert Mountain Cave" type="warp" x="1216" y="3872" width="32" height="32">
+  <object id="17" name="To Desert Mountain Cave" class="warp" x="1216" y="3872" width="32" height="32">
    <properties>
     <property name="dest_map" value="006-3"/>
     <property name="dest_tile_x" value="38"/>
     <property name="dest_tile_y" value="123"/>
    </properties>
   </object>
-  <object name="To Desert Mountain Cave" type="warp" x="2368" y="2880" width="32" height="32">
+  <object id="18" name="To Desert Mountain Cave" class="warp" x="2368" y="2880" width="32" height="32">
    <properties>
     <property name="dest_map" value="006-3"/>
     <property name="dest_tile_x" value="74"/>
     <property name="dest_tile_y" value="92"/>
    </properties>
   </object>
-  <object name="To Desert Mountain Cave" type="warp" x="1632" y="2880" width="32" height="32">
+  <object id="19" name="To Desert Mountain Cave" class="warp" x="1632" y="2880" width="32" height="32">
    <properties>
     <property name="dest_map" value="006-3"/>
     <property name="dest_tile_x" value="51"/>
     <property name="dest_tile_y" value="92"/>
    </properties>
   </object>
-  <object name="Snake" type="spawn" x="1472" y="1632" width="256" height="128">
+  <object id="20" name="Snake" class="spawn" x="1472" y="1632" width="256" height="128">
    <properties>
     <property name="eA_death" value="30000"/>
     <property name="eA_spawn" value="100000"/>
@@ -1162,7 +1162,7 @@
     <property name="monster_id" value="8"/>
    </properties>
   </object>
-  <object name="MountainSnake" type="spawn" x="1440" y="960" width="544" height="448">
+  <object id="21" name="MountainSnake" class="spawn" x="1440" y="960" width="544" height="448">
    <properties>
     <property name="eA_death" value="10000"/>
     <property name="eA_spawn" value="150000"/>
@@ -1170,7 +1170,7 @@
     <property name="monster_id" value="24"/>
    </properties>
   </object>
-  <object name="MountainSnake" type="spawn" x="2336" y="640" width="1088" height="448">
+  <object id="22" name="MountainSnake" class="spawn" x="2336" y="640" width="1088" height="448">
    <properties>
     <property name="eA_death" value="75000"/>
     <property name="eA_spawn" value="15000"/>
@@ -1178,7 +1178,7 @@
     <property name="monster_id" value="24"/>
    </properties>
   </object>
-  <object name="MountainSnake" type="spawn" x="3424" y="736" width="416" height="1216">
+  <object id="23" name="MountainSnake" class="spawn" x="3424" y="736" width="416" height="1216">
    <properties>
     <property name="eA_death" value="75000"/>
     <property name="eA_spawn" value="15000"/>
@@ -1186,7 +1186,7 @@
     <property name="monster_id" value="24"/>
    </properties>
   </object>
-  <object name="MountainSnake" type="spawn" x="3520" y="1600" width="224" height="128">
+  <object id="24" name="MountainSnake" class="spawn" x="3520" y="1600" width="224" height="128">
    <properties>
     <property name="eA_death" value="75000"/>
     <property name="eA_spawn" value="15000"/>
@@ -1194,7 +1194,7 @@
     <property name="monster_id" value="24"/>
    </properties>
   </object>
-  <object name="MountainSnake" type="spawn" x="2304" y="1408" width="960" height="192">
+  <object id="25" name="MountainSnake" class="spawn" x="2304" y="1408" width="960" height="192">
    <properties>
     <property name="eA_death" value="75000"/>
     <property name="eA_spawn" value="15000"/>
@@ -1202,7 +1202,7 @@
     <property name="monster_id" value="24"/>
    </properties>
   </object>
-  <object name="MountainSnake" type="spawn" x="3040" y="2112" width="704" height="480">
+  <object id="26" name="MountainSnake" class="spawn" x="3040" y="2112" width="704" height="480">
    <properties>
     <property name="eA_death" value="75000"/>
     <property name="eA_spawn" value="15000"/>
@@ -1210,7 +1210,7 @@
     <property name="monster_id" value="24"/>
    </properties>
   </object>
-  <object name="MountainSnake" type="spawn" x="2208" y="3072" width="288" height="448">
+  <object id="27" name="MountainSnake" class="spawn" x="2208" y="3072" width="288" height="448">
    <properties>
     <property name="eA_death" value="75000"/>
     <property name="eA_spawn" value="15000"/>
@@ -1218,7 +1218,7 @@
     <property name="monster_id" value="24"/>
    </properties>
   </object>
-  <object name="MountainSnake" type="spawn" x="3168" y="2976" width="384" height="512">
+  <object id="28" name="MountainSnake" class="spawn" x="3168" y="2976" width="384" height="512">
    <properties>
     <property name="eA_death" value="75000"/>
     <property name="eA_spawn" value="15000"/>
@@ -1226,7 +1226,7 @@
     <property name="monster_id" value="24"/>
    </properties>
   </object>
-  <object name="MountainSnake" type="spawn" x="2240" y="2048" width="832" height="544">
+  <object id="29" name="MountainSnake" class="spawn" x="2240" y="2048" width="832" height="544">
    <properties>
     <property name="eA_death" value="75000"/>
     <property name="eA_spawn" value="15000"/>
@@ -1234,7 +1234,7 @@
     <property name="monster_id" value="24"/>
    </properties>
   </object>
-  <object name="MountainSnake" type="spawn" x="2784" y="3584" width="576" height="160">
+  <object id="30" name="MountainSnake" class="spawn" x="2784" y="3584" width="576" height="160">
    <properties>
     <property name="eA_death" value="75000"/>
     <property name="eA_spawn" value="15000"/>
@@ -1242,7 +1242,7 @@
     <property name="monster_id" value="24"/>
    </properties>
   </object>
-  <object name="MountainSnake" type="spawn" x="1536" y="3776" width="608" height="96">
+  <object id="31" name="MountainSnake" class="spawn" x="1536" y="3776" width="608" height="96">
    <properties>
     <property name="eA_death" value="75000"/>
     <property name="eA_spawn" value="15000"/>
@@ -1250,7 +1250,7 @@
     <property name="monster_id" value="24"/>
    </properties>
   </object>
-  <object name="Scorpion" type="spawn" x="640" y="2592" width="896" height="1088">
+  <object id="32" name="Scorpion" class="spawn" x="640" y="2592" width="896" height="1088">
    <properties>
     <property name="eA_death" value="30000"/>
     <property name="eA_spawn" value="100000"/>
@@ -1258,56 +1258,56 @@
     <property name="monster_id" value="1"/>
    </properties>
   </object>
-  <object name="To Outback Cave" type="warp" x="960" y="3936" width="32" height="32">
+  <object id="33" name="To Outback Cave" class="warp" x="960" y="3936" width="32" height="32">
    <properties>
     <property name="dest_map" value="032-3"/>
     <property name="dest_tile_x" value="128"/>
     <property name="dest_tile_y" value="33"/>
    </properties>
   </object>
-  <object name="To Pachua's Village" type="warp" x="1056" y="2720" width="32" height="32">
+  <object id="34" name="To Pachua's Village" class="warp" x="1056" y="2720" width="32" height="32">
    <properties>
     <property name="dest_map" value="006-2"/>
     <property name="dest_tile_x" value="58"/>
     <property name="dest_tile_y" value="43"/>
    </properties>
   </object>
-  <object name="To Pachua's Village" type="warp" x="736" y="2720" width="32" height="32">
+  <object id="35" name="To Pachua's Village" class="warp" x="736" y="2720" width="32" height="32">
    <properties>
     <property name="dest_map" value="006-2"/>
     <property name="dest_tile_x" value="48"/>
     <property name="dest_tile_y" value="43"/>
    </properties>
   </object>
-  <object name="To Pachua's Village" type="warp" x="736" y="3200" width="32" height="32">
+  <object id="36" name="To Pachua's Village" class="warp" x="736" y="3200" width="32" height="32">
    <properties>
     <property name="dest_map" value="006-2"/>
     <property name="dest_tile_x" value="67"/>
     <property name="dest_tile_y" value="64"/>
    </properties>
   </object>
-  <object name="To Pachua's Village" type="warp" x="672" y="3456" width="32" height="32">
+  <object id="37" name="To Pachua's Village" class="warp" x="672" y="3456" width="32" height="32">
    <properties>
     <property name="dest_map" value="006-2"/>
     <property name="dest_tile_x" value="65"/>
     <property name="dest_tile_y" value="72"/>
    </properties>
   </object>
-  <object name="To Desert Mountains" type="warp" x="1184" y="832" width="32" height="32">
+  <object id="38" name="To Desert Mountains" class="warp" x="1184" y="832" width="32" height="32">
    <properties>
     <property name="dest_map" value="006-1"/>
     <property name="dest_tile_x" value="37"/>
     <property name="dest_tile_y" value="23"/>
    </properties>
   </object>
-  <object name="To Desert Mountains" type="warp" x="1184" y="768" width="32" height="32">
+  <object id="39" name="To Desert Mountains" class="warp" x="1184" y="768" width="32" height="32">
    <properties>
     <property name="dest_map" value="006-1"/>
     <property name="dest_tile_x" value="37"/>
     <property name="dest_tile_y" value="27"/>
    </properties>
   </object>
-  <object name="GreenSlime" type="spawn" x="1824" y="1536" width="128" height="128">
+  <object id="40" name="GreenSlime" class="spawn" x="1824" y="1536" width="128" height="128">
    <properties>
     <property name="eA_death" value="30000"/>
     <property name="eA_spawn" value="100000"/>
@@ -1315,7 +1315,7 @@
     <property name="monster_id" value="3"/>
    </properties>
   </object>
-  <object name="Snake" type="spawn" x="1024" y="1536" width="192" height="160">
+  <object id="41" name="Snake" class="spawn" x="1024" y="1536" width="192" height="160">
    <properties>
     <property name="eA_death" value="50000"/>
     <property name="eA_spawn" value="40000"/>
@@ -1323,7 +1323,7 @@
     <property name="monster_id" value="8"/>
    </properties>
   </object>
-  <object name="Snake" type="spawn" x="2752" y="2176" width="672" height="1568">
+  <object id="42" name="Snake" class="spawn" x="2752" y="2176" width="672" height="1568">
    <properties>
     <property name="eA_death" value="50000"/>
     <property name="eA_spawn" value="40000"/>
@@ -1331,7 +1331,7 @@
     <property name="monster_id" value="8"/>
    </properties>
   </object>
-  <object name="Maggot" type="spawn" x="672" y="2656" width="928" height="960">
+  <object id="43" name="Maggot" class="spawn" x="672" y="2656" width="928" height="960">
    <properties>
     <property name="eA_death" value="30000"/>
     <property name="eA_spawn" value="100000"/>
@@ -1339,7 +1339,7 @@
     <property name="monster_id" value="0"/>
    </properties>
   </object>
-  <object name="GreenSlime" type="spawn" x="864" y="2304" width="128" height="96">
+  <object id="44" name="GreenSlime" class="spawn" x="864" y="2304" width="128" height="96">
    <properties>
     <property name="eA_death" value="30000"/>
     <property name="eA_spawn" value="100000"/>
@@ -1347,7 +1347,7 @@
     <property name="monster_id" value="3"/>
    </properties>
   </object>
-  <object name="GreenSlime" type="spawn" x="1024" y="1856" width="128" height="96">
+  <object id="45" name="GreenSlime" class="spawn" x="1024" y="1856" width="128" height="96">
    <properties>
     <property name="eA_death" value="30000"/>
     <property name="eA_spawn" value="100000"/>
@@ -1355,28 +1355,28 @@
     <property name="monster_id" value="3"/>
    </properties>
   </object>
-  <object name="Snake Cave" type="warp" x="1760" y="1472" width="32" height="32">
+  <object id="46" name="Snake Cave" class="warp" x="1760" y="1472" width="32" height="32">
    <properties>
     <property name="dest_map" value="005-3"/>
     <property name="dest_tile_x" value="86"/>
     <property name="dest_tile_y" value="33"/>
    </properties>
   </object>
-  <object name="To Sandstorm Desert" type="warp" x="640" y="1504" width="32" height="64">
+  <object id="47" name="To Sandstorm Desert" class="warp" x="640" y="1504" width="32" height="64">
    <properties>
     <property name="dest_map" value="002-1"/>
     <property name="dest_tile_x" value="118"/>
     <property name="dest_tile_y" value="95"/>
    </properties>
   </object>
-  <object name="Snake Cave" type="warp" x="1632" y="2176" width="32" height="32">
+  <object id="48" name="Snake Cave" class="warp" x="1632" y="2176" width="32" height="32">
    <properties>
     <property name="dest_map" value="005-3"/>
     <property name="dest_tile_x" value="73"/>
     <property name="dest_tile_y" value="61"/>
    </properties>
   </object>
-  <object name="Snake" type="spawn" x="1088" y="2304" width="256" height="128">
+  <object id="49" name="Snake" class="spawn" x="1088" y="2304" width="256" height="128">
    <properties>
     <property name="eA_death" value="30000"/>
     <property name="eA_spawn" value="100000"/>
@@ -1384,7 +1384,7 @@
     <property name="monster_id" value="8"/>
    </properties>
   </object>
-  <object name="Snake" type="spawn" x="2592" y="768" width="1248" height="800">
+  <object id="50" name="Snake" class="spawn" x="2592" y="768" width="1248" height="800">
    <properties>
     <property name="eA_death" value="50000"/>
     <property name="eA_spawn" value="40000"/>
@@ -1392,7 +1392,7 @@
     <property name="monster_id" value="8"/>
    </properties>
   </object>
-  <object name="Snake Cave" type="warp" x="2048" y="2464" width="32" height="32">
+  <object id="51" name="Snake Cave" class="warp" x="2048" y="2464" width="32" height="32">
    <properties>
     <property name="dest_map" value="005-3"/>
     <property name="dest_tile_x" value="107"/>
diff --git a/maps/008-1.tmx b/maps/008-1.tmx
index a5265d7c..2bcad329 100644
--- a/maps/008-1.tmx
+++ b/maps/008-1.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.8" tiledversion="1.8.6" orientation="orthogonal" renderorder="right-down" width="162" height="120" tilewidth="32" tileheight="32" infinite="0" nextlayerid="8" nextobjectid="18">
+<map version="1.9" tiledversion="1.9.2" orientation="orthogonal" renderorder="right-down" width="162" height="120" tilewidth="32" tileheight="32" infinite="0" nextlayerid="8" nextobjectid="18">
  <properties>
   <property name="minimap" value="graphics/minimaps/008-1.png"/>
   <property name="music" value="the-forest.ogg"/>
@@ -143,17 +143,17 @@
  </layer>
  <layer id="2" name="Ground2" width="162" height="120">
   <data encoding="csv">
-0,0,0,0,32,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,249,0,0,0,0,0,249,0,0,0,245,0,203,245,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,95,96,96,97,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,245,0,249,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,219,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,95,96,96,97,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,604,0,0,0,0,0,0,15,0,0,0,0,0,0,0,0,0,235,187,0,0,249,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,95,96,96,97,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-32,0,0,0,0,32,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,187,0,0,0,249,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,95,96,96,97,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,245,0,0,203,249,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,95,96,96,97,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-195,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,95,96,96,97,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,17,0,0,0,0,32,0,0,0,0,0,0,0,0,0,0,0,0,0,31,187,0,0,0,0,0,0,249,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,95,96,96,97,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,561,576,576,546,576,576,546,576,576,546,576,576,546,576,576,546,576,576,546,576,576,543,576,576,562,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,32,0,0,0,31,0,0,0,0,17,18,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,203,0,0,0,0,0,0,249,0,0,249,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,542,95,96,96,97,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,559,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,559,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,118,0,0,0,0,0,0,32,0,0,0,0,219,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,559,95,96,96,97,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,559,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,559,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,31,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,235,0,0,0,0,0,0,0,0,0,249,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,559,95,96,96,97,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,559,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,559,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,32,0,0,0,165,232,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,235,245,249,249,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,559,95,96,96,97,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,559,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,559,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,32,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,249,0,0,0,0,0,249,0,0,0,245,0,203,245,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,95,97,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,245,0,249,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,219,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,95,97,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,604,0,0,0,0,0,0,15,0,0,0,0,0,0,0,0,0,235,187,0,0,249,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,95,97,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+32,0,0,0,0,32,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,187,0,0,0,249,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,95,97,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,245,0,0,203,249,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,79,64,97,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+195,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,95,96,97,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,17,0,0,0,0,32,0,0,0,0,0,0,0,0,0,0,0,0,0,31,187,0,0,0,0,0,0,249,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,95,96,97,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,561,576,576,546,576,576,546,576,576,546,576,576,546,576,576,546,576,576,546,576,576,543,576,576,562,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,32,0,0,0,31,0,0,0,0,17,18,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,203,0,0,0,0,0,0,249,0,0,249,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,542,95,96,97,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,559,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,559,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,118,0,0,0,0,0,0,32,0,0,0,0,219,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,559,95,96,97,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,559,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,559,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,31,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,235,0,0,0,0,0,0,0,0,0,249,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,559,95,96,97,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,559,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,559,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,32,0,0,0,165,232,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,235,245,249,249,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,559,95,96,63,81,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,559,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,559,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,171,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,171,249,0,0,245,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,559,95,96,96,97,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,559,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,559,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,203,0,0,0,0,0,0,0,32,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,187,245,0,0,245,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,559,95,96,96,97,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,559,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,559,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,219,0,0,0,0,0,0,0,0,0,0,203,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,33,0,0,187,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,559,95,96,96,97,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,559,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,559,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -391,20 +391,20 @@
  </layer>
  <layer id="3" name="Fringe" width="162" height="120">
   <data encoding="csv">
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,291,292,0,0,0,0,0,0,0,0,0,0,0,0,291,292,0,0,0,0,0,0,0,0,0,0,0,291,292,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-292,0,0,0,0,0,0,291,292,0,0,0,0,0,0,0,0,0,0,0,291,292,0,0,0,0,0,291,292,0,0,0,291,292,0,0,291,292,0,0,0,0,0,0,0,291,292,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,291,292,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,291,292,0,0,291,292,0,0,0,0,0,0,0,0,0,291,292,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,293,294,0,0,0,0,0,0,0,0,0,0,0,0,293,294,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,291,292,0,0,0,0,291,292,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,291,292,0,0,0,0,0,0,0,0,0,0,0,0,0,0,291,0,291,292,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,293,294,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,291,292,0,0,0,293,294,0,0,0,0,0,0,0,0,291,292,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,291,292,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,291,292,0,0,0,293,294,0,0,0,291,292,0,291,292,293,294,0,293,294,0,291,292,293,294,0,291,292,291,292,0,291,292,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,291,292,0,0,0,0,0,0,0,0,0,0,0,0,291,292,0,0,0,0,0,0,0,0,0,0,0,291,292,0,0,0,0,0,0,0,0,0,265,0,0,0,0,0,265,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,291,292,0,291,292,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,293,294,0,293,294,0,0,0,0,291,292,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+292,0,0,0,0,0,0,291,292,0,0,0,0,0,0,0,0,0,0,0,291,292,0,0,0,0,0,291,292,0,0,0,291,292,0,0,291,292,0,0,0,0,0,0,0,291,292,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,291,292,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,291,292,0,0,0,293,294,0,0,0,293,294,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,291,292,0,0,291,292,0,0,0,0,0,0,0,0,0,291,292,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,265,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,293,294,0,0,0,0,0,0,0,0,0,0,0,0,293,294,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,293,294,0,0,0,293,294,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,291,292,0,0,0,0,291,292,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,291,292,0,0,0,0,0,0,0,0,0,0,0,0,0,0,291,0,291,292,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,293,294,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,291,292,0,0,0,293,294,0,0,0,0,0,0,0,0,291,292,0,0,0,293,294,0,0,0,293,294,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,291,292,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,291,292,0,0,0,293,294,0,0,0,291,292,0,291,292,293,294,0,293,294,0,291,292,293,294,0,291,292,291,292,0,291,292,0,0,0,0,0,0,0,0,295,296,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,291,292,0,0,0,0,0,0,0,0,0,0,0,0,0,0,291,292,0,0,0,0,0,0,0,291,292,0,0,0,0,0,0,0,0,0,0,0,291,292,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,295,296,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,293,294,0,0,0,0,0,0,0,0,0,293,294,291,292,293,294,291,292,0,293,294,0,291,292,0,291,292,0,291,292,0,0,0,291,292,0,0,0,0,0,0,0,0,291,292,0,0,0,291,292,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,291,292,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,291,292,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,293,294,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,291,292,0,0,0,0,0,291,292,0,293,294,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,291,292,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,291,292,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,265,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,293,294,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,291,292,0,0,0,0,0,291,292,0,293,294,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,265,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,291,292,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,291,292,0,0,0,291,292,0,293,294,0,293,294,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 292,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,291,292,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,291,292,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,582,583,583,583,583,583,583,583,583,583,583,583,583,583,583,583,583,583,583,584,0,0,291,292,0,291,292,293,294,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,291,292,0,0,0,0,0,291,292,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,291,292,0,0,0,0,293,294,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,582,583,583,583,583,583,583,583,583,583,583,583,583,583,583,583,583,583,583,584,0,0,0,0,291,292,0,0,291,292,291,292,0,0,291,292,0,291,292,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,291,292,0,0,0,0,0,291,292,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,291,292,0,0,0,0,293,294,0,0,0,0,259,260,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,582,583,583,583,583,583,583,583,583,583,583,583,583,583,583,583,583,583,583,584,0,0,0,0,291,292,0,0,291,292,291,292,0,0,291,292,0,291,292,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,291,292,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,293,294,0,291,292,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,291,292,293,0,582,583,583,583,583,583,583,583,583,583,583,583,583,583,583,583,583,583,583,584,0,0,291,292,0,0,0,0,0,0,0,0,291,292,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,291,292,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,291,292,291,292,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,291,292,0,0,0,0,0,293,294,0,0,0,0,0,0,0,0,0,291,292,0,0,0,0,0,291,292,0,0,0,293,294,0,582,583,583,583,583,583,583,583,583,583,583,583,583,583,583,583,583,583,583,584,0,293,294,0,0,293,294,291,292,293,294,293,294,0,0,0,0,293,294,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,295,296,0,0,291,292,0,291,292,293,294,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,291,292,0,0,0,0,0,0,0,0,0,0,0,293,294,0,0,0,0,0,0,0,0,0,582,583,583,583,583,583,583,583,583,583,583,583,583,583,583,583,583,583,583,584,0,0,0,291,292,0,0,0,0,0,0,0,0,0,291,292,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,291,292,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,291,291,292,293,294,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,291,292,0,0,0,0,582,583,583,583,583,583,583,583,583,583,583,583,583,583,583,583,583,583,583,584,0,0,293,294,293,294,0,291,292,0,291,292,0,0,0,293,294,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,291,292,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,291,291,292,293,294,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,291,292,0,0,0,0,582,583,583,583,583,583,583,583,583,583,583,583,583,583,583,583,583,583,583,584,0,0,293,294,293,294,0,291,292,0,291,292,0,0,0,0,293,294,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,291,292,0,0,291,292,0,291,292,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,265,0,0,0,0,0,0,295,296,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,291,292,0,582,583,583,583,583,583,583,583,583,583,583,583,583,583,583,583,583,583,583,584,0,0,0,293,294,291,292,0,0,0,0,293,294,291,292,0,0,291,292,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,291,292,0,0,0,0,0,0,0,0,0,0,0,295,296,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,291,292,293,294,293,294,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,293,294,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,293,294,0,0,582,583,583,583,583,583,583,583,583,583,583,583,583,583,583,583,583,583,583,584,0,293,294,0,0,0,291,292,291,292,293,294,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,293,294,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,291,292,0,0,0,0,0,291,292,0,291,292,0,0,0,0,0,293,294,0,0,0,0,0,0,291,292,293,294,0,293,294,291,292,0,0,0,0,0,0,582,583,583,583,583,583,583,583,583,583,583,583,583,583,583,583,583,583,583,584,0,0,0,0,0,293,294,0,0,0,0,0,293,294,291,292,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -762,91 +762,91 @@
 </data>
  </layer>
  <objectgroup id="6" name="Objects" visible="0">
-  <object id="1" name="To Hurnscald West Entrance" type="warp" x="1728" y="1920" width="32" height="96">
+  <object id="1" name="To Hurnscald West Entrance" class="warp" x="1728" y="1920" width="32" height="96">
    <properties>
     <property name="dest_map" value="009-1"/>
     <property name="dest_tile_x" value="25"/>
     <property name="dest_tile_y" value="36"/>
    </properties>
   </object>
-  <object id="2" name="To Hurnscald South Entrance" type="warp" x="2464" y="2560" width="128" height="32">
+  <object id="2" name="To Hurnscald South Entrance" class="warp" x="2464" y="2560" width="128" height="32">
    <properties>
     <property name="dest_map" value="009-1"/>
     <property name="dest_tile_x" value="48"/>
     <property name="dest_tile_y" value="54"/>
    </properties>
   </object>
-  <object id="3" name="To Hurnscald East Entrance" type="warp" x="4064" y="1920" width="32" height="64">
+  <object id="3" name="To Hurnscald East Entrance" class="warp" x="4064" y="1920" width="32" height="64">
    <properties>
     <property name="dest_map" value="009-1"/>
     <property name="dest_tile_x" value="96"/>
     <property name="dest_tile_y" value="36"/>
    </properties>
   </object>
-  <object id="4" name="To Hurnscald North Entrance" type="warp" x="2464" y="1568" width="128" height="32">
+  <object id="4" name="To Hurnscald North Entrance" class="warp" x="2464" y="1568" width="128" height="32">
    <properties>
     <property name="dest_map" value="009-1"/>
     <property name="dest_tile_x" value="48"/>
     <property name="dest_tile_y" value="25"/>
    </properties>
   </object>
-  <object id="5" name="To Woodland" type="warp" x="768" y="1920" width="32" height="128">
+  <object id="5" name="To Woodland" class="warp" x="768" y="1920" width="32" height="128">
    <properties>
     <property name="dest_map" value="011-1"/>
     <property name="dest_tile_x" value="123"/>
     <property name="dest_tile_y" value="61"/>
    </properties>
   </object>
-  <object id="6" name="To Woodland Mining Camp" type="warp" x="2464" y="544" width="128" height="32">
+  <object id="6" name="To Woodland Mining Camp" class="warp" x="2464" y="544" width="128" height="32">
    <properties>
     <property name="dest_map" value="018-1"/>
     <property name="dest_tile_x" value="78"/>
     <property name="dest_tile_y" value="97"/>
    </properties>
   </object>
-  <object id="7" name="To Woodland" type="warp" x="2464" y="3264" width="128" height="32">
+  <object id="7" name="To Woodland" class="warp" x="2464" y="3264" width="128" height="32">
    <properties>
     <property name="dest_map" value="007-1"/>
     <property name="dest_tile_x" value="68"/>
     <property name="dest_tile_y" value="22"/>
    </properties>
   </object>
-  <object id="8" name="To Woodland" type="warp" x="4192" y="3232" width="96" height="32">
+  <object id="8" name="To Woodland" class="warp" x="4192" y="3232" width="96" height="32">
    <properties>
     <property name="dest_map" value="007-1"/>
     <property name="dest_tile_x" value="122"/>
     <property name="dest_tile_y" value="23"/>
    </properties>
   </object>
-  <object id="9" name="PinkFlower" type="spawn" x="0" y="0">
+  <object id="9" name="PinkFlower" class="spawn" x="0" y="0">
    <properties>
     <property name="eA_spawn" value="20"/>
     <property name="max_beings" value="10"/>
     <property name="monster_id" value="12"/>
    </properties>
   </object>
-  <object id="10" name="Pinkie" type="spawn" x="0" y="0">
+  <object id="10" name="Pinkie" class="spawn" x="0" y="0">
    <properties>
     <property name="eA_spawn" value="20"/>
     <property name="max_beings" value="18"/>
     <property name="monster_id" value="16"/>
    </properties>
   </object>
-  <object id="11" name="ManaBug" type="spawn" x="0" y="0">
+  <object id="11" name="ManaBug" class="spawn" x="0" y="0">
    <properties>
     <property name="eA_spawn" value="30"/>
     <property name="max_beings" value="18"/>
     <property name="monster_id" value="1131"/>
    </properties>
   </object>
-  <object id="12" name="Maggot" type="spawn" x="0" y="0">
+  <object id="12" name="Maggot" class="spawn" x="0" y="0">
    <properties>
     <property name="eA_spawn" value="30"/>
     <property name="max_beings" value="30"/>
     <property name="monster_id" value="1002"/>
    </properties>
   </object>
-  <object id="13" name="MauvePlant" type="spawn" x="0" y="0">
+  <object id="13" name="MauvePlant" class="spawn" x="0" y="0">
    <properties>
     <property name="eA_death" value="180000"/>
     <property name="eA_spawn" value="270000"/>
@@ -854,7 +854,7 @@
     <property name="monster_id" value="27"/>
    </properties>
   </object>
-  <object id="14" name="Silkworm" type="spawn" x="0" y="0">
+  <object id="14" name="Silkworm" class="spawn" x="0" y="0">
    <properties>
     <property name="eA_death" value="30000"/>
     <property name="eA_spawn" value="60000"/>
@@ -862,14 +862,14 @@
     <property name="monster_id" value="33"/>
    </properties>
   </object>
-  <object id="15" name="CloverPatch" type="spawn" x="0" y="0">
+  <object id="15" name="CloverPatch" class="spawn" x="0" y="0">
    <properties>
     <property name="eA_death" value="1000"/>
     <property name="max_beings" value="2"/>
     <property name="monster_id" value="35"/>
    </properties>
   </object>
-  <object id="16" name="Squirrel" type="spawn" x="0" y="0">
+  <object id="16" name="Squirrel" class="spawn" x="0" y="0">
    <properties>
     <property name="eA_death" value="20"/>
     <property name="eA_spawn" value="30"/>
@@ -877,7 +877,7 @@
     <property name="monster_id" value="36"/>
    </properties>
   </object>
-  <object id="17" name="Butterfly" type="spawn" x="0" y="0">
+  <object id="17" name="Butterfly" class="spawn" x="0" y="0">
    <properties>
     <property name="eA_death" value="20"/>
     <property name="eA_spawn" value="30"/>
diff --git a/maps/009-1.tmx b/maps/009-1.tmx
index 2cb56aff..356b4a72 100644
--- a/maps/009-1.tmx
+++ b/maps/009-1.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.8" tiledversion="1.8.0" orientation="orthogonal" renderorder="right-down" width="117" height="75" tilewidth="32" tileheight="32" infinite="0" nextlayerid="10" nextobjectid="95">
+<map version="1.9" tiledversion="1.9.2" orientation="orthogonal" renderorder="right-down" width="117" height="75" tilewidth="32" tileheight="32" infinite="0" nextlayerid="10" nextobjectid="95">
  <properties>
   <property name="minimap" value="graphics/minimaps/009-1.png"/>
   <property name="music" value="magick-real.ogg"/>
@@ -137,19 +137,19 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,96,96,96,96,96,96,96,96,96,96,96,96,96,96,96,96,96,96,96,96,96,96,96,96,96,96,96,96,97,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,48,96,96,97,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,462,0,0,0,0,0,0,16,16,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,462,17,18,17,18,18,17,17,18,18,18,561,576,576,0,0,0,0,541,0,0,576,545,95,96,96,97,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,462,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,462,17,18,17,17,18,18,17,18,17,17,559,0,0,0,0,0,0,0,0,0,0,559,95,96,96,97,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,406,407,408,0,0,0,0,411,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,462,0,0,0,0,0,0,0,0,0,14,14,14,14,14,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,462,18,17,0,0,0,0,0,0,17,18,559,0,502,0,0,0,490,0,0,0,0,559,95,96,96,97,0,0,0,0,0,0,0,0,0,0,0,391,409,0,0,0,0,0,0,406,421,422,0,424,425,408,0,0,0,0,0,0,0,541,490,0,0,0,0,0,0,0,0,0,0,0,462,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,462,17,18,0,31,31,32,32,0,18,18,559,0,518,0,0,0,0,0,0,0,516,559,95,96,96,97,0,0,0,0,0,0,0,0,0,0,0,391,409,0,0,0,0,0,421,422,0,0,0,0,0,424,425,0,0,0,0,0,0,557,0,0,0,0,0,0,0,0,0,0,0,0,462,0,0,0,0,0,0,0,0,0,28,28,28,28,28,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,462,17,18,0,31,32,31,31,0,18,17,559,0,518,0,0,490,0,0,0,0,516,559,95,96,96,97,0,0,0,0,0,0,0,0,0,0,436,360,361,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,573,0,0,0,0,0,0,0,0,0,0,0,0,462,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,462,17,18,17,17,18,18,17,18,17,17,559,0,0,0,0,0,0,0,0,0,0,559,95,96,96,97,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,411,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,462,0,0,0,0,0,0,0,0,0,14,14,14,14,14,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,462,18,17,0,0,0,0,0,0,17,18,559,0,502,0,0,0,490,0,0,0,0,559,95,96,96,97,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,406,421,422,0,424,425,408,0,0,0,0,0,0,0,541,490,0,0,0,0,0,0,0,0,0,0,0,462,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,462,17,18,0,31,31,32,32,0,18,18,559,0,518,0,0,0,0,0,0,0,516,559,95,96,96,97,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,421,422,0,0,0,0,0,424,425,0,0,0,0,0,0,557,0,0,0,0,0,0,0,0,0,0,0,0,462,0,0,0,0,0,0,0,0,0,28,28,28,28,28,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,462,17,18,0,31,32,31,31,0,18,17,559,0,518,0,0,490,0,0,0,0,516,559,95,96,96,97,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,573,0,0,0,0,0,0,0,0,0,0,0,0,462,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,462,18,17,18,0,32,32,0,18,17,18,559,0,534,0,0,0,0,0,0,0,532,559,95,96,96,97,0,0,0,0,0,0,0,0,0,0,452,452,377,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,462,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,462,0,18,18,0,31,31,0,18,17,0,559,0,0,0,0,0,0,650,617,0,0,0,95,96,96,97,0,0,0,0,0,469,469,469,469,469,469,469,469,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,462,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,462,0,18,18,0,31,31,0,18,17,0,559,0,0,0,0,0,0,650,617,0,0,0,95,96,96,97,0,0,0,0,0,0,0,0,0,0,469,469,469,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,462,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,462,0,18,17,0,32,32,0,17,17,0,559,0,0,0,0,0,0,53,4,4,4,4,50,96,96,97,0,0,0,0,0,0,0,0,0,0,0,541,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,491,0,0,0,516,0,0,0,462,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,462,18,18,18,0,31,32,0,18,18,18,559,0,0,0,0,0,0,0,0,0,0,0,95,96,96,97,0,0,0,0,0,0,0,0,0,0,0,557,0,0,0,0,0,0,0,0,0,20,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,532,0,0,0,462,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,462,17,17,0,32,31,31,32,0,17,18,559,574,574,0,0,0,0,0,0,0,0,559,95,96,96,97,0,0,0,0,0,636,0,0,0,0,0,573,0,0,0,0,0,0,0,0,0,20,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,462,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,462,17,17,0,31,32,31,32,0,17,18,559,574,574,574,574,0,0,0,0,0,0,559,95,96,96,97,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,462,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,462,17,18,0,0,0,0,0,0,18,17,560,576,576,576,576,576,576,576,576,576,576,577,95,96,96,97,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,462,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,462,17,18,18,17,18,18,17,17,17,18,0,0,0,0,0,0,0,0,0,0,0,0,95,96,96,97,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,462,0,0,0,0,0,0,0,0,0,14,14,14,14,14,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,462,18,18,17,17,17,18,18,18,18,17,0,0,0,0,0,0,0,0,0,0,0,0,95,96,96,97,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,355,341,390,391,392,345,363,372,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,462,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,462,18,18,17,17,17,18,18,18,18,17,0,0,0,0,0,0,0,0,0,0,0,0,95,96,96,97,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,462,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,462,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,95,96,96,97,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,404,405,406,407,408,392,410,0,0,489,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,462,0,0,0,0,0,0,31,32,0,28,28,28,28,28,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,95,96,96,97,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,420,421,422,0,424,425,426,0,0,489,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,32,31,32,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,95,96,96,97,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,32,32,31,0,0,0,0,0,0,0,0,0,0,
@@ -374,18 +374,18 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,462,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,374,375,376,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,374,389,405,391,392,393,376,0,0,0,0,0,0,0,0,0,0,388,389,390,391,392,393,394,0,0,0,462,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,462,0,0,0,0,0,0,0,0,0,0,0,0,0,374,389,405,391,409,393,376,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,374,375,376,0,0,0,0,374,389,405,405,405,391,392,392,392,393,376,0,0,0,0,435,437,437,437,404,324,325,344,392,392,410,0,0,0,462,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,462,0,0,0,0,0,0,0,0,0,0,0,0,387,405,405,405,391,409,409,409,395,0,0,0,0,0,0,0,0,0,0,0,0,0,388,389,390,391,392,393,394,0,387,405,405,405,405,405,391,392,392,392,392,392,395,0,0,0,451,452,453,453,453,340,356,391,392,392,473,0,0,0,462,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,462,0,0,0,0,0,0,0,0,0,0,0,0,403,405,405,488,488,488,409,409,411,0,0,0,0,0,0,0,0,0,0,0,0,0,403,390,390,391,409,409,410,0,403,405,0,0,0,0,0,0,0,0,0,409,0,0,0,0,502,468,468,468,355,356,390,391,392,392,508,0,0,0,462,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,462,0,0,0,0,0,0,0,0,0,0,0,0,403,488,488,488,488,488,488,488,473,0,0,0,0,0,0,0,0,0,0,0,0,0,403,390,390,0,0,409,473,0,403,405,0,0,0,0,0,0,0,0,0,409,473,0,0,0,518,0,0,0,404,390,390,391,392,392,524,0,0,0,462,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,462,0,0,0,0,0,0,0,0,0,0,0,0,487,504,504,504,504,504,504,504,507,0,0,0,0,0,0,0,0,0,0,0,0,0,403,390,390,0,0,409,489,0,403,406,0,0,0,0,0,0,0,0,0,408,489,0,0,0,534,0,0,0,404,390,390,391,541,392,524,0,0,0,462,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,462,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,435,437,437,437,437,404,390,0,0,0,409,489,0,503,504,0,0,0,0,0,0,0,0,0,504,489,0,0,0,0,0,0,0,404,390,390,391,392,392,524,0,0,0,462,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,462,0,0,0,0,0,0,0,0,0,0,0,0,403,405,405,488,488,488,409,409,411,0,0,0,0,0,0,0,0,0,0,0,0,0,403,390,390,391,409,409,410,0,403,405,390,390,390,406,407,408,392,392,392,409,0,0,0,0,502,468,468,468,355,356,390,391,392,392,508,0,0,0,462,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,462,0,0,0,0,0,0,0,0,0,0,0,0,403,488,488,488,488,488,488,488,473,0,0,0,0,0,0,0,0,0,0,0,0,0,403,390,390,391,409,409,473,0,403,405,0,0,0,0,0,0,0,0,0,409,473,0,0,0,518,0,0,0,404,390,390,391,392,392,524,0,0,0,462,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,462,0,0,0,0,0,0,0,0,0,0,0,0,487,504,504,504,504,504,504,504,507,0,0,0,0,0,0,0,0,0,0,0,0,0,403,390,390,391,409,409,489,0,403,406,0,0,0,0,0,0,0,0,0,408,489,0,0,0,534,0,0,0,404,390,390,391,541,392,524,0,0,0,462,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,462,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,435,437,437,437,437,404,390,436,360,361,409,489,0,503,504,0,0,0,0,0,0,0,0,0,504,489,0,0,0,0,0,0,0,404,390,390,391,392,392,524,0,0,0,462,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,462,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,451,453,453,453,453,453,452,0,0,0,361,489,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,404,390,406,407,408,392,524,0,0,0,462,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,462,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,467,468,0,0,0,0,0,0,0,0,378,489,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,420,421,422,0,424,504,524,0,0,0,462,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,462,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,467,468,469,469,469,469,469,0,0,0,378,489,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,420,421,422,0,424,504,524,0,0,0,462,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,462,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,462,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,462,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,462,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,462,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,462,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,462,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,435,437,437,437,437,437,437,437,438,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,462,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,462,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,435,437,437,437,437,437,437,438,451,453,453,453,453,453,453,453,473,0,0,435,437,437,437,437,327,328,437,437,437,437,438,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,462,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,462,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,451,453,0,0,0,0,453,473,451,453,453,453,453,453,453,453,489,0,0,451,453,453,340,341,391,345,346,453,453,453,473,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,462,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,462,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,451,453,452,452,452,452,453,473,451,453,453,453,453,453,453,453,489,0,0,451,453,453,340,341,391,345,346,453,453,453,473,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,462,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,462,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,487,521,0,0,0,0,521,524,451,453,0,0,0,0,0,453,489,0,0,487,522,0,0,0,0,0,0,0,0,521,489,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,462,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,462,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,487,0,0,0,0,0,0,0,467,469,0,0,0,0,0,469,470,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,462,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -465,7 +465,7 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,454,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,454,0,0,0,0,0,0,0,0,454,0,0,0,0,0,0,0,0,0,0,0,0,0,454,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,467,469,0,0,0,0,469,470,0,0,0,0,0,0,0,0,454,0,0,467,468,0,0,0,0,0,0,0,0,469,470,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,467,469,0,0,0,0,469,470,0,0,0,0,0,0,0,0,454,0,0,467,468,355,341,390,391,392,345,363,372,469,470,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -650,84 +650,84 @@
 </data>
  </layer>
  <objectgroup id="9" name="Objects" visible="0">
-  <object id="1" name="To Hurnscald South Exit" type="warp" x="1504" y="1760" width="128" height="32">
+  <object id="1" name="To Hurnscald South Exit" class="warp" x="1504" y="1760" width="128" height="32">
    <properties>
     <property name="dest_map" value="008-1"/>
     <property name="dest_tile_x" value="78"/>
     <property name="dest_tile_y" value="81"/>
    </properties>
   </object>
-  <object id="2" name="To Hurnscald East Exit" type="warp" x="3104" y="1120" width="32" height="64">
+  <object id="2" name="To Hurnscald East Exit" class="warp" x="3104" y="1120" width="32" height="64">
    <properties>
     <property name="dest_map" value="008-1"/>
     <property name="dest_tile_x" value="128"/>
     <property name="dest_tile_y" value="61"/>
    </properties>
   </object>
-  <object id="3" name="To Hurnscald Inn" type="warp" x="1120" y="960" width="32" height="32">
+  <object id="3" name="To Hurnscald Inn" class="warp" x="1120" y="960" width="32" height="32">
    <properties>
     <property name="dest_map" value="009-2"/>
     <property name="dest_tile_x" value="50"/>
     <property name="dest_tile_y" value="54"/>
    </properties>
   </object>
-  <object id="4" name="To Storage Room" type="warp" x="1856" y="1472" width="32" height="32">
+  <object id="4" name="To Storage Room" class="warp" x="1856" y="1472" width="32" height="32">
    <properties>
     <property name="dest_map" value="009-2"/>
     <property name="dest_tile_x" value="27"/>
     <property name="dest_tile_y" value="106"/>
    </properties>
   </object>
-  <object id="5" name="To Archer Shop" type="warp" x="1888" y="1056" width="32" height="32">
+  <object id="5" name="To Archer Shop" class="warp" x="1888" y="1056" width="32" height="32">
    <properties>
     <property name="dest_map" value="009-2"/>
     <property name="dest_tile_x" value="95"/>
     <property name="dest_tile_y" value="29"/>
    </properties>
   </object>
-  <object id="6" name="To Hurnscald Potion Shop" type="warp" x="2272" y="960" width="32" height="32">
+  <object id="6" name="To Hurnscald Potion Shop" class="warp" x="2272" y="960" width="32" height="32">
    <properties>
     <property name="dest_map" value="009-2"/>
     <property name="dest_tile_x" value="130"/>
     <property name="dest_tile_y" value="25"/>
    </properties>
   </object>
-  <object id="7" name="To Hurnscald Hospital" type="warp" x="2560" y="992" width="32" height="32">
+  <object id="7" name="To Hurnscald Hospital" class="warp" x="2560" y="992" width="32" height="32">
    <properties>
     <property name="dest_map" value="009-2"/>
     <property name="dest_tile_x" value="149"/>
     <property name="dest_tile_y" value="66"/>
    </properties>
   </object>
-  <object id="8" name="To Hurnscald House" type="warp" x="2304" y="1408" width="32" height="32">
+  <object id="8" name="To Hurnscald House" class="warp" x="2304" y="1408" width="32" height="32">
    <properties>
     <property name="dest_map" value="009-2"/>
     <property name="dest_tile_x" value="114"/>
     <property name="dest_tile_y" value="77"/>
    </properties>
   </object>
-  <object id="9" name="To Hurnscald Forge" type="warp" x="2880" y="1472" width="64" height="32">
+  <object id="9" name="To Hurnscald Forge" class="warp" x="2880" y="1472" width="64" height="32">
    <properties>
     <property name="dest_map" value="009-2"/>
     <property name="dest_tile_x" value="182"/>
     <property name="dest_tile_y" value="66"/>
    </properties>
   </object>
-  <object id="10" name="To Hurnscald West Exit" type="warp" x="768" y="1120" width="32" height="96">
+  <object id="10" name="To Hurnscald West Exit" class="warp" x="768" y="1120" width="32" height="96">
    <properties>
     <property name="dest_map" value="008-1"/>
     <property name="dest_tile_x" value="53"/>
     <property name="dest_tile_y" value="61"/>
    </properties>
   </object>
-  <object id="11" name="To Hurnscald North Exit" type="warp" x="1504" y="768" width="128" height="32">
+  <object id="11" name="To Hurnscald North Exit" class="warp" x="1504" y="768" width="128" height="32">
    <properties>
     <property name="dest_map" value="008-1"/>
     <property name="dest_tile_x" value="78"/>
     <property name="dest_tile_y" value="48"/>
    </properties>
   </object>
-  <object id="12" name="CloverPatch" type="spawn" x="2336" y="1024" width="96" height="64">
+  <object id="12" name="CloverPatch" class="spawn" x="2336" y="1024" width="96" height="64">
    <properties>
     <property name="eA_death" value="120000"/>
     <property name="eA_spawn" value="100000"/>
@@ -735,28 +735,28 @@
     <property name="monster_id" value="35"/>
    </properties>
   </object>
-  <object id="13" name="PinkFlower" type="spawn" x="800" y="1216" width="320" height="448">
+  <object id="13" name="PinkFlower" class="spawn" x="800" y="1216" width="320" height="448">
    <properties>
     <property name="eA_death" value="250"/>
     <property name="max_beings" value="2"/>
     <property name="monster_id" value="12"/>
    </properties>
   </object>
-  <object id="14" name="Squirrel" type="spawn" x="2592" y="1568" width="512" height="160">
+  <object id="14" name="Squirrel" class="spawn" x="2592" y="1568" width="512" height="160">
    <properties>
     <property name="eA_death" value="5000"/>
     <property name="max_beings" value="2"/>
     <property name="monster_id" value="36"/>
    </properties>
   </object>
-  <object id="15" name="Squirrel" type="spawn" x="2496" y="1152" width="192" height="192">
+  <object id="15" name="Squirrel" class="spawn" x="2496" y="1152" width="192" height="192">
    <properties>
     <property name="eA_death" value="5000"/>
     <property name="max_beings" value="1"/>
     <property name="monster_id" value="36"/>
    </properties>
   </object>
-  <object id="16" name="Butterfly" type="spawn" x="0" y="0">
+  <object id="16" name="Butterfly" class="spawn" x="0" y="0">
    <properties>
     <property name="eA_death" value="20"/>
     <property name="eA_spawn" value="30"/>
@@ -764,7 +764,7 @@
     <property name="monster_id" value="53"/>
    </properties>
   </object>
-  <object id="17" name="To Bedroom" type="warp" x="1920" y="1312" width="32" height="32">
+  <object id="17" name="To Bedroom" class="warp" x="1920" y="1312" width="32" height="32">
    <properties>
     <property name="dest_map" value="009-2"/>
     <property name="dest_tile_x" value="32"/>
diff --git a/maps/015-1.tmx b/maps/015-1.tmx
index 68931cd8..41130a36 100644
--- a/maps/015-1.tmx
+++ b/maps/015-1.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.0" orientation="orthogonal" renderorder="right-down" width="140" height="120" tilewidth="32" tileheight="32" nextobjectid="14">
+<map version="1.9" tiledversion="1.9.2" orientation="orthogonal" renderorder="right-down" width="140" height="120" tilewidth="32" tileheight="32" infinite="0" nextlayerid="7" nextobjectid="14">
  <properties>
   <property name="minimap" value="graphics/minimaps/015-1.png"/>
   <property name="music" value="the-forest.ogg"/>
@@ -15,7 +15,7 @@
  <tileset firstgid="291" source="../tilesets/woodland_x3.tsx"/>
  <tileset firstgid="323" source="../tilesets/woodland_village.tsx"/>
  <tileset firstgid="579" source="../tilesets/woodland_x5.tsx"/>
- <layer name="Ground1" width="140" height="120">
+ <layer id="1" name="Ground1" width="140" height="120">
   <data encoding="csv">
 35,3,35,35,19,3,51,3,3,35,19,3,35,35,35,19,51,51,3,51,35,3,51,19,35,19,19,19,35,19,19,35,35,3,51,35,19,19,3,51,35,35,19,35,35,19,3,35,19,19,19,19,51,35,19,51,3,51,3,51,51,3,51,51,51,3,51,3,51,19,19,19,19,51,51,51,19,19,51,3,51,51,51,51,51,85,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,87,19,19,19,19,19,3,3,3,3,3,3,3,3,3,101,102,102,102,102,102,102,102,102,102,102,103,3,3,3,3,3,3,3,3,3,3,3,
 3,35,35,19,51,3,51,35,35,3,51,35,19,19,19,51,19,19,3,51,51,3,51,19,19,19,35,19,35,19,51,35,19,3,3,51,51,35,3,51,35,19,35,35,19,51,3,35,19,19,51,3,51,35,19,3,51,51,51,19,19,51,19,19,19,51,19,51,19,35,19,19,35,19,51,19,51,51,19,3,51,51,51,51,51,85,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,87,19,19,19,19,19,3,3,3,3,3,3,122,73,73,73,128,128,129,73,73,128,129,73,73,130,3,3,3,3,3,3,3,3,3,3,3,3,
@@ -139,7 +139,7 @@
 3,3,3,35,3,3,3,35,3,3,35,67,67,35,3,3,3,51,35,19,3,51,3,67,19,67,3,51,19,67,35,35,19,35,35,67,35,67,67,35,51,3,19,3,67,35,35,91,93,107,51,35,3,3,51,67,35,3,67,35,51,67,3,35,35,3,19,3,3,3,121,40,89,89,89,140,177,178,67,35,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,51,51,51,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3
 </data>
  </layer>
- <layer name="Ground2" width="140" height="120">
+ <layer id="2" name="Ground2" width="140" height="120">
   <data encoding="csv">
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,179,187,0,0,0,32,32,32,0,0,0,0,0,0,0,0,0,0,0,0,0,0,20,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,230,180,203,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,53,4,4,4,4,4,4,4,4,4,0,
@@ -263,7 +263,7 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,31,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,33,0,0,0,0,0,0,0,37,4,4,4,4,4,4,0,0,0,4,5,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,31,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,20,0,0,0
 </data>
  </layer>
- <layer name="Fringe" width="140" height="120">
+ <layer id="3" name="Fringe" width="140" height="120">
   <data encoding="csv">
 292,0,0,0,0,291,292,0,0,0,0,0,291,292,0,0,0,0,0,0,293,294,0,0,0,0,293,294,0,0,0,293,294,0,0,0,291,292,0,0,291,292,0,291,292,0,0,0,0,291,292,0,0,293,294,293,294,291,292,0,0,291,292,0,0,0,0,291,292,0,291,292,0,0,291,292,0,0,291,292,0,0,291,292,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,263,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,293,294,293,294,0,0,0,293,294,0,0,0,0,0,0,293,294,0,0,293,294,291,292,0,293,294,0,0,0,291,292,0,293,294,0,0,0,0,291,292,0,291,292,291,292,291,292,0,0,293,294,291,292,291,292,0,0,0,0,291,292,0,0,291,292,0,0,291,292,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -349,7 +349,7 @@
 0,0,0,293,294,0,0,0,291,292,0,291,292,0,0,0,0,0,0,293,294,0,293,294,0,0,0,0,0,0,0,0,291,292,0,291,292,0,0,0,291,292,0,0,291,292,293,294,291,292,0,0,0,0,0,291,292,0,0,293,294,0,293,294,0,291,292,0,291,292,0,0,0,0,0,0,0,291,292,0,0,266,267,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,268,268,268,268,268,268,268,
 0,0,0,291,292,0,291,292,0,0,0,0,0,0,293,294,0,0,0,0,0,0,0,0,0,0,0,0,293,294,0,0,0,0,0,0,0,0,291,292,0,0,293,294,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,291,292,0,0,291,292,0,0,0,0,0,0,0,0,0,0,0,293,294,0,0,0,0,293,294,291,292,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,268,268,268,268,268,268,
 0,0,295,296,0,0,0,0,291,292,0,0,0,0,0,0,0,0,0,266,267,0,0,0,0,0,0,0,0,0,291,292,291,292,0,293,294,0,0,0,0,0,0,0,0,0,0,0,0,293,294,0,293,294,293,294,0,293,294,0,0,0,0,0,0,0,0,0,293,294,0,0,293,294,291,292,0,0,0,0,0,291,292,0,0,0,0,291,292,0,0,0,0,293,294,0,0,0,0,0,0,0,0,0,0,291,292,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,268,268,268,268,268,
-292,0,0,0,0,0,0,293,294,0,0,0,0,0,0,291,292,0,0,0,291,292,266,267,0,0,0,0,293,294,0,293,294,293,294,0,0,291,292,0,293,294,0,0,291,292,266,267,0,0,0,0,0,0,0,0,0,0,0,266,267,0,263,0,0,293,294,0,0,291,292,0,0,0,0,0,0,0,0,0,293,294,0,293,294,0,291,292,291,292,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,268,268,268,268,
+292,0,0,0,0,0,0,293,294,0,0,0,0,0,0,291,292,0,0,0,291,292,266,267,0,0,0,0,293,294,0,293,294,293,294,0,0,291,292,0,293,294,259,260,291,292,266,267,0,0,0,0,0,0,0,0,0,0,0,266,267,0,263,0,0,293,294,0,0,291,292,0,0,0,0,0,0,0,0,0,293,294,0,293,294,0,291,292,291,292,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,268,268,268,268,
 0,293,294,0,291,292,0,293,294,291,292,293,294,291,292,0,0,293,294,0,0,293,294,267,0,0,0,0,0,0,0,0,0,0,0,291,292,0,0,0,0,0,0,0,0,0,0,0,0,0,291,292,263,0,0,0,293,294,0,0,0,0,0,0,0,0,0,0,291,292,293,294,0,0,0,0,0,0,0,0,0,293,294,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,291,292,0,0,291,292,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,268,268,
 0,293,294,0,0,0,0,0,0,0,0,293,294,0,0,293,294,0,0,293,294,0,291,292,0,0,0,0,0,293,294,291,292,0,0,0,0,0,291,292,293,294,0,293,294,0,0,0,293,294,0,0,0,291,292,293,294,0,293,294,0,0,293,294,0,0,0,0,0,0,293,294,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,293,294,0,0,0,0,0,0,0,0,0,0,0,0,291,292,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,268,268,
 293,294,291,292,293,294,0,293,294,0,0,291,292,293,294,293,294,0,0,291,292,0,293,294,0,0,0,0,0,0,293,294,293,294,0,0,0,0,0,0,0,0,0,0,0,293,294,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,291,292,0,291,292,291,292,0,0,0,0,293,294,0,0,0,0,0,293,294,0,0,0,0,0,0,0,0,0,0,0,293,294,0,0,0,291,292,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,268,268,
@@ -387,7 +387,7 @@
 584,0,0,0,0,0,0,293,294,0,291,292,0,0,0,0,0,293,294,291,292,582,583,584,0,0,293,294,0,293,294,0,0,291,292,0,293,294,0,0,0,0,0,0,0,0,0,0,0,0,0,0,579,580,581,0,291,292,582,583,584,0,293,294,0,293,294,0,0,0,0,0,0,0,0,0,0,0,0,0,293,294,0,291,292,0,293,294,291,292,0,0,291,292,291,292,293,294,293,294,291,292,293,294,291,292,293,294,291,292,291,292,293,294,0,293,294,291,292,293,294,293,294,293,294,293,294,0,0,293,294,0,293,294,0,0,0,0,0,0
 </data>
  </layer>
- <layer name="Over1" width="140" height="120">
+ <layer id="4" name="Over1" width="140" height="120">
   <data encoding="csv">
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,6,7,8,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,22,23,24,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -511,7 +511,7 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 </data>
  </layer>
- <layer name="Collision" width="140" height="120">
+ <layer id="5" name="Collision" width="140" height="120" visible="0">
   <data encoding="csv">
 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
@@ -635,22 +635,22 @@
 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2
 </data>
  </layer>
- <objectgroup name="Objects">
-  <object id="1" name="To Woodland" type="warp" x="2976" y="1728" width="32" height="64">
+ <objectgroup id="6" name="Objects" visible="0">
+  <object id="1" name="To Woodland" class="warp" x="2976" y="1728" width="32" height="64">
    <properties>
     <property name="dest_map" value="010-1"/>
     <property name="dest_tile_x" value="14"/>
     <property name="dest_tile_y" value="54"/>
    </properties>
   </object>
-  <object id="2" name="To Cat's Cave" type="warp" x="1888" y="992" width="32" height="32">
+  <object id="2" name="To Cat's Cave" class="warp" x="1888" y="992" width="32" height="32">
    <properties>
     <property name="dest_map" value="015-3"/>
     <property name="dest_tile_x" value="31"/>
     <property name="dest_tile_y" value="42"/>
    </properties>
   </object>
-  <object id="3" name="CloverPatch" type="spawn" x="0" y="0">
+  <object id="3" name="CloverPatch" class="spawn" x="0" y="0">
    <properties>
     <property name="eA_death" value="1000"/>
     <property name="eA_spawn" value="100000"/>
@@ -658,14 +658,14 @@
     <property name="monster_id" value="35"/>
    </properties>
   </object>
-  <object id="4" name="To Woodland Swamp" type="warp" x="1824" y="3232" width="128" height="32">
+  <object id="4" name="To Woodland Swamp" class="warp" x="1824" y="3232" width="128" height="32">
    <properties>
     <property name="dest_map" value="025-1"/>
     <property name="dest_tile_x" value="89"/>
     <property name="dest_tile_y" value="20"/>
    </properties>
   </object>
-  <object id="5" name="Butterfly" type="spawn" x="0" y="0">
+  <object id="5" name="Butterfly" class="spawn" x="0" y="0">
    <properties>
     <property name="eA_death" value="20"/>
     <property name="eA_spawn" value="30"/>
@@ -673,7 +673,7 @@
     <property name="monster_id" value="53"/>
    </properties>
   </object>
-  <object id="6" name="Squirrel" type="spawn" x="0" y="0">
+  <object id="6" name="Squirrel" class="spawn" x="0" y="0">
    <properties>
     <property name="eA_death" value="10"/>
     <property name="eA_spawn" value="20"/>
@@ -681,7 +681,7 @@
     <property name="monster_id" value="36"/>
    </properties>
   </object>
-  <object id="7" name="LogHead" type="spawn" x="0" y="0">
+  <object id="7" name="LogHead" class="spawn" x="0" y="0">
    <properties>
     <property name="eA_death" value="0"/>
     <property name="eA_spawn" value="0"/>
@@ -689,7 +689,7 @@
     <property name="monster_id" value="23"/>
    </properties>
   </object>
-  <object id="8" name="SpikyMushroom" type="spawn" x="0" y="0">
+  <object id="8" name="SpikyMushroom" class="spawn" x="0" y="0">
    <properties>
     <property name="eA_death" value="0"/>
     <property name="eA_spawn" value="0"/>
@@ -697,7 +697,7 @@
     <property name="monster_id" value="17"/>
    </properties>
   </object>
-  <object id="9" name="PinkFlower" type="spawn" x="0" y="0">
+  <object id="9" name="PinkFlower" class="spawn" x="0" y="0">
    <properties>
     <property name="eA_death" value="0"/>
     <property name="eA_spawn" value="0"/>
@@ -705,7 +705,7 @@
     <property name="monster_id" value="12"/>
    </properties>
   </object>
-  <object id="10" name="GambogePlant" type="spawn" x="0" y="0">
+  <object id="10" name="GambogePlant" class="spawn" x="0" y="0">
    <properties>
     <property name="eA_death" value="0"/>
     <property name="eA_spawn" value="0"/>
@@ -713,7 +713,7 @@
     <property name="monster_id" value="29"/>
    </properties>
   </object>
-  <object id="11" name="AlizarinPlant" type="spawn" x="0" y="0">
+  <object id="11" name="AlizarinPlant" class="spawn" x="0" y="0">
    <properties>
     <property name="eA_death" value="0"/>
     <property name="eA_spawn" value="0"/>
@@ -721,7 +721,7 @@
     <property name="monster_id" value="30"/>
    </properties>
   </object>
-  <object id="12" name="Silkworm" type="spawn" x="0" y="0">
+  <object id="12" name="Silkworm" class="spawn" x="0" y="0">
    <properties>
     <property name="eA_death" value="7000"/>
     <property name="eA_spawn" value="15000"/>
@@ -729,7 +729,7 @@
     <property name="monster_id" value="33"/>
    </properties>
   </object>
-  <object id="13" name="MauvePlant" type="spawn" x="0" y="0">
+  <object id="13" name="MauvePlant" class="spawn" x="0" y="0">
    <properties>
     <property name="eA_death" value="180000"/>
     <property name="eA_spawn" value="270000"/>
diff --git a/maps/017-2.tmx b/maps/017-2.tmx
index b05eb7b2..a1769a69 100644
--- a/maps/017-2.tmx
+++ b/maps/017-2.tmx
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.0" orientation="orthogonal" width="53" height="51" tilewidth="32" tileheight="32">
+<map version="1.9" tiledversion="1.9.2" orientation="orthogonal" renderorder="right-down" width="53" height="51" tilewidth="32" tileheight="32" infinite="0" nextlayerid="8" nextobjectid="3">
  <properties>
   <property name="name" value="Theater"/>
  </properties>
  <tileset firstgid="1" source="../tilesets/collision.tsx"/>
  <tileset firstgid="3" source="../tilesets/woodland_indoor.tsx"/>
- <layer name="Ground1" width="53" height="51">
+ <layer id="1" name="Ground1" width="53" height="51">
   <data encoding="csv">
 51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,
 51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,
@@ -60,7 +60,7 @@
 51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51
 </data>
  </layer>
- <layer name="Ground2" width="53" height="51">
+ <layer id="2" name="Ground2" width="53" height="51">
   <data encoding="csv">
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -115,7 +115,7 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 </data>
  </layer>
- <layer name="Ground3" width="53" height="51">
+ <layer id="3" name="Ground3" width="53" height="51">
   <data encoding="csv">
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -170,7 +170,7 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 </data>
  </layer>
- <layer name="Fringe" width="53" height="51">
+ <layer id="4" name="Fringe" width="53" height="51">
   <data encoding="csv">
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -225,7 +225,7 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 </data>
  </layer>
- <layer name="Over1" width="53" height="51">
+ <layer id="5" name="Over1" width="53" height="51">
   <data encoding="csv">
 51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,
 51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,
@@ -280,7 +280,7 @@
 51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51
 </data>
  </layer>
- <layer name="Collision" width="53" height="51">
+ <layer id="6" name="Collision" width="53" height="51">
   <data encoding="csv">
 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
@@ -303,7 +303,7 @@
 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,2,2,2,2,2,2,2,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
-2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
+2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,2,0,0,0,0,0,0,0,0,0,2,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,2,0,0,0,0,0,0,0,0,0,2,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,2,0,0,0,0,0,0,0,0,0,2,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,2,0,0,0,0,0,0,0,0,0,2,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
@@ -335,15 +335,15 @@
 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2
 </data>
  </layer>
- <objectgroup name="Objects">
-  <object name="To Outside" type="warp" x="832" y="992" width="32" height="32">
+ <objectgroup id="7" name="Objects">
+  <object id="1" name="To Outside" class="warp" x="832" y="992" width="32" height="32">
    <properties>
     <property name="dest_map" value="017-1"/>
     <property name="dest_tile_x" value="43"/>
     <property name="dest_tile_y" value="33"/>
    </properties>
   </object>
-  <object name="To Center Trapdoor Backstage" type="warp" x="832" y="672" width="32" height="32">
+  <object id="2" name="To Center Trapdoor Backstage" class="warp" x="832" y="672" width="32" height="32">
    <properties>
     <property name="dest_map" value="017-9"/>
     <property name="dest_tile_x" value="26"/>
diff --git a/maps/018-1.tmx b/maps/018-1.tmx
index fe66ccaf..f558f47e 100644
--- a/maps/018-1.tmx
+++ b/maps/018-1.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.4" tiledversion="1.4.3" orientation="orthogonal" renderorder="right-down" width="200" height="120" tilewidth="32" tileheight="32" infinite="0" nextlayerid="8" nextobjectid="47">
+<map version="1.9" tiledversion="1.9.2" orientation="orthogonal" renderorder="right-down" width="200" height="120" tilewidth="32" tileheight="32" infinite="0" nextlayerid="9" nextobjectid="47">
  <properties>
   <property name="minimap" value="graphics/minimaps/018-1.png"/>
   <property name="music" value="the-forest.ogg"/>
@@ -21,6 +21,8 @@
  <tileset firstgid="323" source="../tilesets/woodland_village.tsx"/>
  <tileset firstgid="579" source="../tilesets/woodland_village_x2.tsx"/>
  <tileset firstgid="595" source="../tilesets/woodland_indoor.tsx"/>
+ <tileset firstgid="851" source="../tilesets/woodland_x3_to_1x.tsx"/>
+ <tileset firstgid="947" source="../tilesets/woodland_village_x2_to_1x.tsx"/>
  <layer id="1" name="Ground1" width="200" height="120">
   <data encoding="csv">
 19,19,19,19,19,19,19,181,150,123,89,41,73,123,89,89,89,89,89,89,19,19,19,19,19,19,19,19,19,19,19,19,89,89,41,129,73,73,73,128,73,125,19,19,19,72,73,73,123,89,89,89,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,43,44,19,19,19,19,19,19,213,147,123,89,41,73,123,57,105,105,106,19,19,138,56,90,69,71,19,19,19,85,19,19,19,19,19,19,19,19,19,19,19,43,44,19,19,19,19,19,59,60,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,59,60,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,88,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,
@@ -266,7 +268,7 @@
 540,0,0,20,0,0,0,559,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,559,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,20,0,15,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,95,96,96,97,0,0,0,0,0,0,0,0,0,0,0,0,0,0,558,0,20,578,576,576,546,576,576,546,576,576,546,576,576,546,576,576,576,577,0,20,0,0,0,0,0,0,0,0,0,0,0,0,0,559,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 556,0,0,20,0,0,0,560,576,576,576,576,576,576,576,576,576,169,167,167,167,167,167,167,167,167,167,167,167,167,0,0,0,0,559,0,0,0,0,0,0,0,245,0,0,0,0,0,0,0,0,20,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,95,96,96,97,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,20,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,20,0,542,0,0,0,0,0,0,0,0,0,0,0,559,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,20,0,0,0,0,0,0,0,0,0,0,0,230,246,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,15,0,0,20,0,0,0,0,0,0,17,18,0,0,0,0,0,0,0,0,0,0,0,0,0,384,0,0,0,95,96,96,66,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,36,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,54,0,559,0,0,0,0,0,0,0,0,0,0,0,559,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-4,4,4,54,0,0,0,0,0,0,0,0,0,0,230,246,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,192,194,0,249,0,0,0,20,0,0,0,0,0,0,18,18,17,0,0,0,0,0,0,0,0,0,0,384,0,0,0,384,0,95,96,96,97,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,20,561,576,576,546,576,576,562,0,0,0,578,576,576,546,576,576,545,0,20,0,559,0,0,0,0,0,0,0,0,0,0,0,559,0,0,33,34,33,34,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+4,4,4,54,0,0,0,0,0,0,0,0,0,0,230,246,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,192,194,0,249,0,0,0,20,0,0,0,0,0,0,18,18,17,0,0,0,0,0,0,0,0,0,0,384,0,0,0,384,0,95,96,96,97,950,951,951,951,951,951,951,951,951,951,951,951,951,951,951,952,20,561,576,576,546,576,576,562,0,0,0,578,576,576,546,576,576,545,0,20,0,559,0,0,0,0,0,0,0,0,0,0,0,559,0,0,33,34,33,34,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 </data>
  </layer>
  <layer id="3" name="Fringe" width="200" height="120">
@@ -513,8 +515,8 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,230,0,0,0,0,0,0,0,0,0,0,0,0,0,167,167,167,167,167,167,167,167,167,165,232,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,248,232,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,293,294,0,248,232,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,248,232,0,0,0,0,0,0,0,0,0,0,0,851,852,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,855,856,0,0,0,0,0,0,0,0,0,0,0,855,856,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,293,294,0,248,232,0,0,0,0,0,0,0,0,0,0,867,868,0,0,0,0,0,0,950,951,951,951,951,951,951,951,951,952,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,871,872,0,855,856,0,0,0,0,0,855,856,0,871,872,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 </data>
  </layer>
  <layer id="5" name="Over2" width="200" height="120">
@@ -641,7 +643,7 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 </data>
  </layer>
- <layer id="6" name="Collision" width="200" height="120">
+ <layer id="6" name="Collision" width="200" height="120" visible="0">
   <data encoding="csv">
 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
@@ -766,105 +768,105 @@
 </data>
  </layer>
  <objectgroup id="7" name="Objects" visible="0">
-  <object id="1" name="To Northern Mine" type="warp" x="2496" y="1888" width="64" height="32">
+  <object id="1" name="To Northern Mine" class="warp" x="2496" y="1888" width="64" height="32">
    <properties>
     <property name="dest_map" value="018-3"/>
     <property name="dest_tile_x" value="100"/>
     <property name="dest_tile_y" value="132"/>
    </properties>
   </object>
-  <object id="2" name="To Bat Cave" type="warp" x="3584" y="1952" width="32" height="32">
+  <object id="2" name="To Bat Cave" class="warp" x="3584" y="1952" width="32" height="32">
    <properties>
     <property name="dest_map" value="018-3"/>
     <property name="dest_tile_x" value="44"/>
     <property name="dest_tile_y" value="38"/>
    </properties>
   </object>
-  <object id="3" name="To Woodland Hills Cave" type="warp" x="3680" y="1280" width="32" height="32">
+  <object id="3" name="To Woodland Hills Cave" class="warp" x="3680" y="1280" width="32" height="32">
    <properties>
     <property name="dest_map" value="013-3"/>
     <property name="dest_tile_x" value="22"/>
     <property name="dest_tile_y" value="114"/>
    </properties>
   </object>
-  <object id="4" name="To Northern Mine" type="warp" x="4096" y="1792" width="32" height="32">
+  <object id="4" name="To Northern Mine" class="warp" x="4096" y="1792" width="32" height="32">
    <properties>
     <property name="dest_map" value="018-3"/>
     <property name="dest_tile_x" value="49"/>
     <property name="dest_tile_y" value="99"/>
    </properties>
   </object>
-  <object id="5" name="To Northern Mine" type="warp" x="2880" y="1344" width="32" height="32">
+  <object id="5" name="To Northern Mine" class="warp" x="2880" y="1344" width="32" height="32">
    <properties>
     <property name="dest_map" value="018-3"/>
     <property name="dest_tile_x" value="123"/>
     <property name="dest_tile_y" value="166"/>
    </properties>
   </object>
-  <object id="6" name="To Northern Mine" type="warp" x="2208" y="1728" width="32" height="32">
+  <object id="6" name="To Northern Mine" class="warp" x="2208" y="1728" width="32" height="32">
    <properties>
     <property name="dest_map" value="018-3"/>
     <property name="dest_tile_x" value="70"/>
     <property name="dest_tile_y" value="105"/>
    </properties>
   </object>
-  <object id="7" name="To Woodland Hills Cave" type="warp" x="4064" y="1152" width="32" height="32">
+  <object id="7" name="To Woodland Hills Cave" class="warp" x="4064" y="1152" width="32" height="32">
    <properties>
     <property name="dest_map" value="013-3"/>
     <property name="dest_tile_x" value="139"/>
     <property name="dest_tile_y" value="44"/>
    </properties>
   </object>
-  <object id="8" name="To Woodland Hills Cave" type="warp" x="4289" y="1442" width="32" height="32">
+  <object id="8" name="To Woodland Hills Cave" class="warp" x="4289" y="1442" width="32" height="32">
    <properties>
     <property name="dest_map" value="013-3"/>
     <property name="dest_tile_x" value="61"/>
     <property name="dest_tile_y" value="178"/>
    </properties>
   </object>
-  <object id="9" name="To Woodland Hills Cave" type="warp" x="4704" y="1280" width="32" height="32">
+  <object id="9" name="To Woodland Hills Cave" class="warp" x="4704" y="1280" width="32" height="32">
    <properties>
     <property name="dest_map" value="013-3"/>
     <property name="dest_tile_x" value="81"/>
     <property name="dest_tile_y" value="102"/>
    </properties>
   </object>
-  <object id="10" name="To Northern Mine" type="warp" x="4896" y="1472" width="32" height="32">
+  <object id="10" name="To Northern Mine" class="warp" x="4896" y="1472" width="32" height="32">
    <properties>
     <property name="dest_map" value="018-3"/>
     <property name="dest_tile_x" value="145"/>
     <property name="dest_tile_y" value="162"/>
    </properties>
   </object>
-  <object id="11" name="To Northern Mine" type="warp" x="5056" y="1088" width="32" height="32">
+  <object id="11" name="To Northern Mine" class="warp" x="5056" y="1088" width="32" height="32">
    <properties>
     <property name="dest_map" value="018-3"/>
     <property name="dest_tile_x" value="64"/>
     <property name="dest_tile_y" value="103"/>
    </properties>
   </object>
-  <object id="12" name="To Northern Mine" type="warp" x="5184" y="1408" width="32" height="32">
+  <object id="12" name="To Northern Mine" class="warp" x="5184" y="1408" width="32" height="32">
    <properties>
     <property name="dest_map" value="018-3"/>
     <property name="dest_tile_x" value="29"/>
     <property name="dest_tile_y" value="166"/>
    </properties>
   </object>
-  <object id="13" name="To Jack O Cave" type="warp" x="5664" y="640" width="32" height="32">
+  <object id="13" name="To Jack O Cave" class="warp" x="5664" y="640" width="32" height="32">
    <properties>
     <property name="dest_map" value="013-3"/>
     <property name="dest_tile_x" value="177"/>
     <property name="dest_tile_y" value="90"/>
    </properties>
   </object>
-  <object id="14" name="To Woodland Mining Camp Indoor" type="warp" x="2080" y="2336" width="32" height="32">
+  <object id="14" name="To Woodland Mining Camp Indoor" class="warp" x="2080" y="2336" width="32" height="32">
    <properties>
     <property name="dest_map" value="018-2"/>
     <property name="dest_tile_x" value="50"/>
     <property name="dest_tile_y" value="28"/>
    </properties>
   </object>
-  <object id="15" name="SeaSlime" type="spawn" x="4224" y="1888" width="320" height="1344">
+  <object id="15" name="SeaSlime" class="spawn" x="4224" y="1888" width="320" height="1344">
    <properties>
     <property name="eA_death" value="30000"/>
     <property name="eA_spawn" value="100000"/>
@@ -872,7 +874,7 @@
     <property name="monster_id" value="31"/>
    </properties>
   </object>
-  <object id="16" name="ManaBug" type="spawn" x="2624" y="2400" width="1728" height="832">
+  <object id="16" name="ManaBug" class="spawn" x="2624" y="2400" width="1728" height="832">
    <properties>
     <property name="eA_death" value="30000"/>
     <property name="eA_spawn" value="100000"/>
@@ -880,7 +882,7 @@
     <property name="monster_id" value="1131"/>
    </properties>
   </object>
-  <object id="17" name="SeaSlime" type="spawn" x="3616" y="1312" width="224" height="256">
+  <object id="17" name="SeaSlime" class="spawn" x="3616" y="1312" width="224" height="256">
    <properties>
     <property name="eA_death" value="30000"/>
     <property name="eA_spawn" value="100000"/>
@@ -888,7 +890,7 @@
     <property name="monster_id" value="31"/>
    </properties>
   </object>
-  <object id="18" name="PinkFlower" type="spawn" x="3616" y="1696" width="448" height="224">
+  <object id="18" name="PinkFlower" class="spawn" x="3616" y="1696" width="448" height="224">
    <properties>
     <property name="eA_death" value="30000"/>
     <property name="eA_spawn" value="100000"/>
@@ -896,7 +898,7 @@
     <property name="monster_id" value="12"/>
    </properties>
   </object>
-  <object id="19" name="JackO" type="spawn" x="5344" y="608" width="576" height="640">
+  <object id="19" name="JackO" class="spawn" x="5344" y="608" width="576" height="640">
    <properties>
     <property name="eA_death" value="120000"/>
     <property name="eA_spawn" value="180000"/>
@@ -904,7 +906,7 @@
     <property name="monster_id" value="20"/>
    </properties>
   </object>
-  <object id="20" name="YellowSlime" type="spawn" x="2464" y="1888" width="128" height="64">
+  <object id="20" name="YellowSlime" class="spawn" x="2464" y="1888" width="128" height="64">
    <properties>
     <property name="eA_death" value="30000"/>
     <property name="eA_spawn" value="100000"/>
@@ -912,7 +914,7 @@
     <property name="monster_id" value="5"/>
    </properties>
   </object>
-  <object id="21" name="Silkworm" type="spawn" x="1600" y="1920" width="480" height="256">
+  <object id="21" name="Silkworm" class="spawn" x="1600" y="1920" width="480" height="256">
    <properties>
     <property name="eA_death" value="30000"/>
     <property name="eA_spawn" value="100000"/>
@@ -920,7 +922,7 @@
     <property name="monster_id" value="33"/>
    </properties>
   </object>
-  <object id="22" name="Bat" type="spawn" x="896" y="1568" width="1024" height="928">
+  <object id="22" name="Bat" class="spawn" x="896" y="1568" width="1024" height="928">
    <properties>
     <property name="eA_death" value="30000"/>
     <property name="eA_spawn" value="100000"/>
@@ -928,14 +930,14 @@
     <property name="monster_id" value="15"/>
    </properties>
   </object>
-  <object id="23" name="To Hurnscald Outskirts" type="warp" x="2464" y="3136" width="128" height="32">
+  <object id="23" name="To Hurnscald Outskirts" class="warp" x="2464" y="3136" width="128" height="32">
    <properties>
     <property name="dest_map" value="008-1"/>
     <property name="dest_tile_x" value="78"/>
     <property name="dest_tile_y" value="18"/>
    </properties>
   </object>
-  <object id="24" name="GrassSnake" type="spawn" x="4000" y="1088" width="608" height="352">
+  <object id="24" name="GrassSnake" class="spawn" x="4000" y="1088" width="608" height="352">
    <properties>
     <property name="eA_death" value="50000"/>
     <property name="eA_spawn" value="100000"/>
@@ -943,7 +945,7 @@
     <property name="monster_id" value="32"/>
    </properties>
   </object>
-  <object id="25" name="GrassSnake" type="spawn" x="3840" y="1184" width="320" height="384">
+  <object id="25" name="GrassSnake" class="spawn" x="3840" y="1184" width="320" height="384">
    <properties>
     <property name="eA_death" value="50000"/>
     <property name="eA_spawn" value="100000"/>
@@ -951,7 +953,7 @@
     <property name="monster_id" value="32"/>
    </properties>
   </object>
-  <object id="26" name="GrassSnake" type="spawn" x="3616" y="480" width="736" height="320">
+  <object id="26" name="GrassSnake" class="spawn" x="3616" y="480" width="736" height="320">
    <properties>
     <property name="eA_death" value="50000"/>
     <property name="eA_spawn" value="100000"/>
@@ -959,7 +961,7 @@
     <property name="monster_id" value="32"/>
    </properties>
   </object>
-  <object id="27" name="GrassSnake" type="spawn" x="3616" y="800" width="640" height="320">
+  <object id="27" name="GrassSnake" class="spawn" x="3616" y="800" width="640" height="320">
    <properties>
     <property name="eA_death" value="50000"/>
     <property name="eA_spawn" value="100000"/>
@@ -967,7 +969,7 @@
     <property name="monster_id" value="32"/>
    </properties>
   </object>
-  <object id="28" name="Bat" type="spawn" x="4608" y="1312" width="352" height="288">
+  <object id="28" name="Bat" class="spawn" x="4608" y="1312" width="352" height="288">
    <properties>
     <property name="eA_death" value="30000"/>
     <property name="eA_spawn" value="100000"/>
@@ -975,7 +977,7 @@
     <property name="monster_id" value="15"/>
    </properties>
   </object>
-  <object id="29" name="RedSlime" type="spawn" x="5088" y="1344" width="672" height="352">
+  <object id="29" name="RedSlime" class="spawn" x="5088" y="1344" width="672" height="352">
    <properties>
     <property name="eA_death" value="30000"/>
     <property name="eA_spawn" value="120000"/>
@@ -983,7 +985,7 @@
     <property name="monster_id" value="6"/>
    </properties>
   </object>
-  <object id="30" name="Bat" type="spawn" x="4160" y="1440" width="448" height="288">
+  <object id="30" name="Bat" class="spawn" x="4160" y="1440" width="448" height="288">
    <properties>
     <property name="eA_death" value="30000"/>
     <property name="eA_spawn" value="100000"/>
@@ -991,7 +993,7 @@
     <property name="monster_id" value="15"/>
    </properties>
   </object>
-  <object id="31" name="CloverPatch" type="spawn" x="5120" y="1440" width="448" height="320">
+  <object id="31" name="CloverPatch" class="spawn" x="5120" y="1440" width="448" height="320">
    <properties>
     <property name="eA_death" value="30000"/>
     <property name="eA_spawn" value="100000"/>
@@ -999,7 +1001,7 @@
     <property name="monster_id" value="35"/>
    </properties>
   </object>
-  <object id="32" name="Silkworm" type="spawn" x="3488" y="1952" width="192" height="96">
+  <object id="32" name="Silkworm" class="spawn" x="3488" y="1952" width="192" height="96">
    <properties>
     <property name="eA_death" value="30000"/>
     <property name="eA_spawn" value="60000"/>
@@ -1007,7 +1009,7 @@
     <property name="monster_id" value="33"/>
    </properties>
   </object>
-  <object id="33" name="SeaSlime" type="spawn" x="3680" y="1568" width="160" height="128">
+  <object id="33" name="SeaSlime" class="spawn" x="3680" y="1568" width="160" height="128">
    <properties>
     <property name="eA_death" value="60000"/>
     <property name="eA_spawn" value="120000"/>
@@ -1015,7 +1017,7 @@
     <property name="monster_id" value="31"/>
    </properties>
   </object>
-  <object id="34" name="RedSlime" type="spawn" x="2784" y="1344" width="608" height="384">
+  <object id="34" name="RedSlime" class="spawn" x="2784" y="1344" width="608" height="384">
    <properties>
     <property name="eA_death" value="50000"/>
     <property name="eA_spawn" value="100000"/>
@@ -1023,7 +1025,7 @@
     <property name="monster_id" value="6"/>
    </properties>
   </object>
-  <object id="35" name="CobaltPlant" type="spawn" x="3168" y="1568" width="512" height="224">
+  <object id="35" name="CobaltPlant" class="spawn" x="3168" y="1568" width="512" height="224">
    <properties>
     <property name="eA_death" value="120000"/>
     <property name="eA_spawn" value="240000"/>
@@ -1031,7 +1033,7 @@
     <property name="monster_id" value="28"/>
    </properties>
   </object>
-  <object id="36" name="RedSlime" type="spawn" x="1920" y="1664" width="1216" height="224">
+  <object id="36" name="RedSlime" class="spawn" x="1920" y="1664" width="1216" height="224">
    <properties>
     <property name="eA_death" value="50000"/>
     <property name="eA_spawn" value="100000"/>
@@ -1039,7 +1041,7 @@
     <property name="monster_id" value="6"/>
    </properties>
   </object>
-  <object id="37" name="RedSlime" type="spawn" x="4480" y="640" width="352" height="320">
+  <object id="37" name="RedSlime" class="spawn" x="4480" y="640" width="352" height="320">
    <properties>
     <property name="eA_death" value="50000"/>
     <property name="eA_spawn" value="100000"/>
@@ -1047,7 +1049,7 @@
     <property name="monster_id" value="6"/>
    </properties>
   </object>
-  <object id="38" name="Bat" type="spawn" x="1952" y="2592" width="480" height="576">
+  <object id="38" name="Bat" class="spawn" x="1952" y="2592" width="480" height="576">
    <properties>
     <property name="eA_death" value="50000"/>
     <property name="eA_spawn" value="100000"/>
@@ -1055,7 +1057,7 @@
     <property name="monster_id" value="15"/>
    </properties>
   </object>
-  <object id="39" name="RedSlime" type="spawn" x="4960" y="704" width="384" height="608">
+  <object id="39" name="RedSlime" class="spawn" x="4960" y="704" width="384" height="608">
    <properties>
     <property name="eA_death" value="50000"/>
     <property name="eA_spawn" value="100000"/>
@@ -1063,15 +1065,15 @@
     <property name="monster_id" value="6"/>
    </properties>
   </object>
-  <object id="40" name="graphics/particles/waterfall-1x3.particle.xml" type="particle_effect" x="3468" y="1290"/>
-  <object id="41" name="CloverPatch" type="spawn" x="0" y="0">
+  <object id="40" name="graphics/particles/waterfall-1x3.particle.xml" class="particle_effect" x="3468" y="1290"/>
+  <object id="41" name="CloverPatch" class="spawn" x="0" y="0">
    <properties>
     <property name="eA_death" value="1000"/>
     <property name="max_beings" value="2"/>
     <property name="monster_id" value="35"/>
    </properties>
   </object>
-  <object id="42" name="Butterfly" type="spawn" x="0" y="0">
+  <object id="42" name="Butterfly" class="spawn" x="0" y="0">
    <properties>
     <property name="eA_death" value="20"/>
     <property name="eA_spawn" value="30"/>
@@ -1079,22 +1081,22 @@
     <property name="monster_id" value="53"/>
    </properties>
   </object>
-  <object id="43" name="graphics/particles/bonfire.particle.xml" type="particle_effect" x="2080" y="2528" width="32" height="32"/>
-  <object id="44" name="To Woodland Mining Camp Indoor" type="warp" x="2048" y="2240" width="32" height="32">
+  <object id="43" name="graphics/particles/bonfire.particle.xml" class="particle_effect" x="2080" y="2528" width="32" height="32"/>
+  <object id="44" name="To Woodland Mining Camp Indoor" class="warp" x="2048" y="2240" width="32" height="32">
    <properties>
     <property name="dest_map" value="018-2"/>
     <property name="dest_tile_x" value="41"/>
     <property name="dest_tile_y" value="21"/>
    </properties>
   </object>
-  <object id="45" name="To Northern Mine" type="warp" x="2496" y="1088" width="32" height="32">
+  <object id="45" name="To Northern Mine" class="warp" x="2496" y="1088" width="32" height="32">
    <properties>
     <property name="dest_map" value="018-3"/>
     <property name="dest_tile_x" value="107"/>
     <property name="dest_tile_y" value="147"/>
    </properties>
   </object>
-  <object id="46" name="Maggot" type="spawn" x="4064" y="1952" width="480" height="1280">
+  <object id="46" name="Maggot" class="spawn" x="4064" y="1952" width="480" height="1280">
    <properties>
     <property name="eA_spawn" value="30"/>
     <property name="max_beings" value="15"/>
diff --git a/maps/023-3.tmx b/maps/023-3.tmx
index 29769674..4753977a 100644
--- a/maps/023-3.tmx
+++ b/maps/023-3.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.0" orientation="orthogonal" width="160" height="170" tilewidth="32" tileheight="32">
+<map version="1.9" tiledversion="1.9.2" orientation="orthogonal" renderorder="right-down" width="160" height="170" tilewidth="32" tileheight="32" infinite="0" nextlayerid="7" nextobjectid="15">
  <properties>
   <property name="music" value="peace.ogg"/>
   <property name="name" value="Tulimshar Beach Caves"/>
@@ -10,7 +10,7 @@
  <tileset firstgid="387" source="../tilesets/cave2_bilevel_water_lava.tsx"/>
  <tileset firstgid="643" source="../tilesets/cave2_x2.tsx"/>
  <tileset firstgid="675" source="../tilesets/cave2_sewer_mine_x4.tsx"/>
- <layer name="Ground1" width="160" height="170">
+ <layer id="1" name="Ground1" width="160" height="170">
   <data encoding="csv">
 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,483,42,42,42,436,531,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,532,437,113,113,113,113,113,113,113,94,130,23,23,23,23,23,23,
 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,499,113,113,113,452,547,485,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,532,548,453,113,113,113,113,113,113,94,130,23,23,23,23,23,23,23,
@@ -184,7 +184,7 @@
 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,112,113,113,113,113,113,419,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23
 </data>
  </layer>
- <layer name="Ground2" width="160" height="170">
+ <layer id="2" name="Ground2" width="160" height="170">
   <data encoding="csv">
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,4,5,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25,12,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25,12,0,0,0,0,0,0,0,
@@ -224,7 +224,7 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,468,213,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,12,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,11,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,11,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,12,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,11,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,12,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,11,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,12,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,11,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,12,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,678,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,11,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,93,131,388,0,0,0,0,0,0,0,0,0,0,12,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,11,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,131,12,0,0,0,0,0,0,0,0,0,12,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,12,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,11,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,131,12,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,11,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -300,7 +300,7 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,552,0,0,0,0,0,0,12,0,0,0,0,0,0,0,0,0,0,0,0,11,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,12,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,149,0,61,0,0,0,0,0,0,0,0,147,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,12,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,12,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,149,0,0,0,0,0,0,0,0,0,0,147,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,12,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,11,0,12,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,149,0,0,0,0,0,0,0,0,0,0,147,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,12,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,11,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,11,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,11,133,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,12,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,11,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,11,0,0,0,0,0,0,678,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,11,133,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,12,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,11,0,0,0,12,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,149,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,11,0,12,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,11,0,0,0,0,0,0,0,0,0,0,0,12,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,149,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,11,0,0,0,0,0,0,0,0,0,12,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,11,133,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -358,7 +358,7 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,149,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 </data>
  </layer>
- <layer name="Fringe" width="160" height="170">
+ <layer id="3" name="Fringe" width="160" height="170">
   <data encoding="csv">
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -398,7 +398,7 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,678,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,643,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,643,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -474,7 +474,7 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,678,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,647,648,649,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -532,7 +532,7 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 </data>
  </layer>
- <layer name="Over1" width="160" height="170">
+ <layer id="4" name="Over1" width="160" height="170">
   <data encoding="csv">
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -706,7 +706,7 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 </data>
  </layer>
- <layer name="Collision" width="160" height="170">
+ <layer id="5" name="Collision" width="160" height="170" visible="0">
   <data encoding="csv">
 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
@@ -880,64 +880,64 @@
 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2
 </data>
  </layer>
- <objectgroup name="Objects" width="0" height="0" visible="0">
-  <object name="To Lighthouse Beach" type="warp" x="2400" y="4288" width="32" height="32">
+ <objectgroup id="6" name="Objects" visible="0">
+  <object id="1" name="To Lighthouse Beach" class="warp" x="2400" y="4288" width="32" height="32">
    <properties>
     <property name="dest_map" value="023-1"/>
     <property name="dest_tile_x" value="75"/>
     <property name="dest_tile_y" value="136"/>
    </properties>
   </object>
-  <object name="To Lighthouse Beach" type="warp" x="2272" y="3744" width="32" height="32">
+  <object id="2" name="To Lighthouse Beach" class="warp" x="2272" y="3744" width="32" height="32">
    <properties>
     <property name="dest_map" value="023-1"/>
     <property name="dest_tile_x" value="71"/>
     <property name="dest_tile_y" value="119"/>
    </properties>
   </object>
-  <object name="To Lighthouse Beach" type="warp" x="2656" y="3648" width="32" height="32">
+  <object id="3" name="To Lighthouse Beach" class="warp" x="2656" y="3648" width="32" height="32">
    <properties>
     <property name="dest_map" value="023-1"/>
     <property name="dest_tile_x" value="83"/>
     <property name="dest_tile_y" value="116"/>
    </properties>
   </object>
-  <object name="To Lighthouse Beach" type="warp" x="3392" y="3840" width="32" height="32">
+  <object id="4" name="To Lighthouse Beach" class="warp" x="3392" y="3840" width="32" height="32">
    <properties>
     <property name="dest_map" value="023-1"/>
     <property name="dest_tile_x" value="107"/>
     <property name="dest_tile_y" value="122"/>
    </properties>
   </object>
-  <object name="To Lighthouse Beach" type="warp" x="3392" y="3584" width="32" height="32">
+  <object id="5" name="To Lighthouse Beach" class="warp" x="3392" y="3584" width="32" height="32">
    <properties>
     <property name="dest_map" value="023-1"/>
     <property name="dest_tile_x" value="105"/>
     <property name="dest_tile_y" value="112"/>
    </properties>
   </object>
-  <object name="To Lighthouse Beach" type="warp" x="2240" y="3040" width="32" height="32">
+  <object id="6" name="To Lighthouse Beach" class="warp" x="2240" y="3040" width="32" height="32">
    <properties>
     <property name="dest_map" value="023-1"/>
     <property name="dest_tile_x" value="70"/>
     <property name="dest_tile_y" value="97"/>
    </properties>
   </object>
-  <object name="To Lighthouse Beach" type="warp" x="1536" y="2560" width="32" height="32">
+  <object id="7" name="To Lighthouse Beach" class="warp" x="1536" y="2560" width="32" height="32">
    <properties>
     <property name="dest_map" value="023-1"/>
     <property name="dest_tile_x" value="48"/>
     <property name="dest_tile_y" value="82"/>
    </properties>
   </object>
-  <object name="To Lighthouse Beach" type="warp" x="1952" y="1152" width="32" height="32">
+  <object id="8" name="To Lighthouse Beach" class="warp" x="1952" y="1152" width="32" height="32">
    <properties>
     <property name="dest_map" value="023-1"/>
     <property name="dest_tile_x" value="61"/>
     <property name="dest_tile_y" value="34"/>
    </properties>
   </object>
-  <object name="Thug" type="spawn" x="2816" y="2368" width="256" height="256">
+  <object id="9" name="Thug" class="spawn" x="2816" y="2368" width="256" height="256">
    <properties>
     <property name="eA_death" value="30000"/>
     <property name="eA_spawn" value="100000"/>
@@ -945,7 +945,7 @@
     <property name="monster_id" value="117"/>
    </properties>
   </object>
-  <object name="Swashbuckler" type="spawn" x="3968" y="2624" width="256" height="256">
+  <object id="10" name="Swashbuckler" class="spawn" x="3968" y="2624" width="256" height="256">
    <properties>
     <property name="eA_death" value="30000"/>
     <property name="eA_spawn" value="100000"/>
@@ -953,7 +953,7 @@
     <property name="monster_id" value="118"/>
    </properties>
   </object>
-  <object name="Swashbuckler" type="spawn" x="3040" y="800" width="256" height="256">
+  <object id="11" name="Swashbuckler" class="spawn" x="3040" y="800" width="256" height="256">
    <properties>
     <property name="eA_death" value="30000"/>
     <property name="eA_spawn" value="100000"/>
@@ -961,7 +961,7 @@
     <property name="monster_id" value="118"/>
    </properties>
   </object>
-  <object name="Thug" type="spawn" x="3744" y="1344" width="256" height="256">
+  <object id="12" name="Thug" class="spawn" x="3744" y="1344" width="256" height="256">
    <properties>
     <property name="eA_death" value="30000"/>
     <property name="eA_spawn" value="100000"/>
@@ -969,7 +969,7 @@
     <property name="monster_id" value="117"/>
    </properties>
   </object>
-  <object name="Swashbuckler" type="spawn" x="1440" y="3360" width="416" height="192">
+  <object id="13" name="Swashbuckler" class="spawn" x="1440" y="3360" width="416" height="192">
    <properties>
     <property name="eA_death" value="30000"/>
     <property name="eA_spawn" value="100000"/>
@@ -977,7 +977,7 @@
     <property name="monster_id" value="118"/>
    </properties>
   </object>
-  <object name="Thug" type="spawn" x="1152" y="1536" width="2144" height="288">
+  <object id="14" name="Thug" class="spawn" x="1152" y="1536" width="2144" height="288">
    <properties>
     <property name="eA_death" value="30000"/>
     <property name="eA_spawn" value="100000"/>
diff --git a/maps/025-4.tmx b/maps/025-4.tmx
index 50ecad36..b066f4a0 100644
--- a/maps/025-4.tmx
+++ b/maps/025-4.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.4" tiledversion="1.4.3" orientation="orthogonal" renderorder="right-down" width="200" height="240" tilewidth="32" tileheight="32" infinite="0" nextlayerid="7" nextobjectid="32">
+<map version="1.9" tiledversion="1.9.2" orientation="orthogonal" renderorder="right-down" width="200" height="240" tilewidth="32" tileheight="32" infinite="0" nextlayerid="7" nextobjectid="32">
  <properties>
   <property name="music" value="night-is-calling.ogg"/>
   <property name="name" value="Rossy Battle Caves"/>
@@ -41,24 +41,24 @@
 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,41,42,37,53,71,72,7,7,54,55,89,90,91,55,56,7,7,68,52,58,59,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,24,7,7,7,7,7,7,7,7,7,7,7,29,30,30,31,7,7,7,7,22,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,21,37,53,74,74,69,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,22,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,
 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,57,58,53,69,7,7,7,7,70,71,105,106,107,71,72,7,7,7,68,74,75,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,24,7,7,7,7,7,7,7,7,7,7,7,29,30,30,31,7,7,126,7,22,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,41,37,53,69,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,38,20,23,21,43,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,
 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,73,74,69,7,7,7,7,7,13,14,14,14,14,14,15,7,7,7,7,7,22,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,8,7,7,7,7,7,7,7,7,7,7,45,46,46,47,7,7,7,7,22,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,57,53,69,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,54,36,39,37,59,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,
-23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,24,7,7,7,7,7,7,7,29,30,30,30,30,30,31,7,7,7,7,7,22,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,24,7,121,7,7,7,7,7,7,7,7,7,7,7,7,7,7,6,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,24,123,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,123,7,7,7,7,7,7,7,7,70,52,55,53,75,23,23,23,23,23,87,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,
-23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,24,7,7,121,7,7,7,7,45,46,46,46,46,46,47,7,7,7,7,7,22,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,24,7,7,7,7,7,7,7,7,7,7,7,7,7,7,6,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,24,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,68,71,69,22,23,23,23,23,23,87,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,
-23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,8,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,126,7,22,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,8,7,7,7,7,7,7,7,7,7,6,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,24,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,123,7,7,22,23,23,23,23,23,87,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,
-23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,24,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,6,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,7,7,7,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,24,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,22,23,23,23,23,23,87,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,
-23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,24,7,7,7,7,7,7,7,7,7,7,7,123,7,7,6,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,7,7,7,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,24,7,7,7,7,7,121,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,22,23,23,23,23,23,87,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,
-23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,8,7,123,7,7,7,7,7,7,7,6,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,24,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,22,23,23,23,23,23,87,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,
-23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,7,7,7,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,24,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,6,23,23,23,23,23,23,87,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,
-23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,7,7,7,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,24,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,121,7,7,7,7,22,23,23,23,23,23,23,87,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,
-23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,8,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,6,23,23,23,23,23,23,23,23,87,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,
-23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,24,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,22,23,23,23,23,23,23,23,23,87,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,
-23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,8,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,123,7,7,7,7,6,23,23,23,23,23,23,23,23,23,87,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,
-23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,24,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,6,23,23,23,23,23,23,23,23,23,23,87,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,
-23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,8,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,22,23,23,23,23,23,23,23,23,23,23,87,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,
-23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,8,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,22,23,23,23,23,23,23,23,23,23,23,87,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,
-23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,8,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,123,6,23,23,23,23,23,23,23,23,23,23,87,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,
-23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,8,123,7,7,7,7,7,7,7,7,7,7,7,7,7,6,23,23,23,23,23,23,23,23,23,23,23,23,23,87,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,
-23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,7,7,7,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,87,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,
-23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,7,7,7,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,87,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,
+23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,24,7,7,7,7,7,7,7,29,30,30,30,30,30,31,7,7,7,7,7,22,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,24,7,121,7,7,7,7,7,7,7,7,7,7,7,7,7,7,6,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,24,123,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,123,7,7,7,7,7,7,7,7,70,52,55,53,75,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,
+23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,24,7,7,121,7,7,7,7,45,46,46,46,46,46,47,7,7,7,7,7,22,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,24,7,7,7,7,7,7,7,7,7,7,7,7,7,7,6,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,24,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,68,71,69,22,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,
+23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,8,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,126,7,22,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,8,7,7,7,7,7,7,7,7,7,6,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,24,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,123,7,7,22,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,
+23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,24,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,6,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,7,7,7,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,24,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,22,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,
+23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,24,7,7,7,7,7,7,7,7,7,7,7,123,7,7,6,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,7,7,7,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,24,7,7,7,7,7,121,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,22,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,
+23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,8,7,123,7,7,7,7,7,7,7,6,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,24,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,22,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,
+23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,7,7,7,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,24,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,6,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,
+23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,7,7,7,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,24,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,121,7,7,7,7,22,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,
+23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,8,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,6,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,
+23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,24,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,22,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,
+23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,8,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,123,7,7,7,7,6,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,
+23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,24,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,6,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,
+23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,8,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,22,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,
+23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,8,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,22,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,
+23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,8,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,123,6,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,
+23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,8,123,7,7,7,7,7,7,7,7,7,7,7,7,7,6,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,
+23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,7,7,7,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,
+23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,7,7,7,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,
 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,
 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,
 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,
@@ -75,7 +75,7 @@
 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,21,42,42,42,42,42,42,42,42,42,42,42,42,42,42,20,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,21,37,58,89,90,91,58,58,64,65,66,58,58,58,58,58,36,39,39,43,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,
 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,21,37,58,58,58,58,58,58,89,90,91,58,58,58,58,58,36,39,39,43,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,41,42,42,42,37,53,74,105,106,107,74,74,80,81,82,74,74,74,74,74,52,55,55,59,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,
 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,21,42,42,37,53,74,74,74,74,74,74,105,106,107,74,74,74,74,74,52,55,55,59,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,57,58,58,58,53,69,7,7,7,7,7,7,7,7,7,7,7,7,7,7,68,71,71,22,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,
-23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,21,37,58,58,53,69,7,7,7,7,7,7,7,7,7,7,7,7,7,7,68,71,71,75,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,73,74,74,74,69,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,38,20,23,23,23,87,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,
+23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,21,37,58,58,53,69,7,7,7,7,7,7,7,7,7,7,7,7,7,7,68,71,71,75,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,73,74,74,74,69,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,38,20,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,
 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,21,37,53,74,74,69,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,38,42,42,20,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,24,7,7,7,126,7,96,97,98,7,7,7,7,7,7,7,7,7,7,7,7,7,7,54,36,42,20,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,
 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,41,37,53,69,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,54,58,58,36,39,39,43,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,24,7,7,7,7,7,112,113,110,98,7,7,7,7,7,7,7,7,7,7,7,7,7,70,52,58,36,43,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,
 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,57,53,69,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,70,74,74,52,55,55,59,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,24,7,7,7,7,96,111,113,113,110,98,7,7,7,7,7,7,7,7,7,7,7,7,7,68,74,52,59,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,
@@ -205,7 +205,7 @@
 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,41,40,7,7,6,23,23,23,23,23,23,7,7,7,7,7,7,7,7,7,7,7,7,23,24,7,7,7,7,7,7,7,38,43,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,21,42,42,42,42,20,23,23,23,23,23,21,42,42,42,20,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,21,37,89,90,91,36,37,55,36,42,43,23,23,21,37,58,36,39,39,43,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,
 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,57,56,126,7,22,23,7,7,23,23,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,8,7,7,7,54,59,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,21,37,58,58,58,58,36,20,23,23,23,21,37,58,58,58,36,39,39,42,43,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,21,37,53,105,106,107,52,53,71,52,58,59,23,41,37,53,74,52,55,55,59,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,
 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,24,72,7,7,22,23,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,41,39,40,7,7,7,70,75,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,21,42,42,37,53,74,74,74,74,52,36,43,23,41,37,53,74,74,74,52,55,55,58,59,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,41,37,53,69,7,7,7,68,69,7,68,74,75,23,57,53,69,7,68,71,71,22,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,
-23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,41,40,7,7,7,38,42,42,43,23,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,57,55,56,7,7,7,7,22,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,21,37,58,58,53,69,7,7,7,7,68,52,59,23,57,53,69,7,7,7,68,71,71,74,75,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,57,53,69,7,7,7,7,7,7,7,7,7,38,20,73,69,7,7,7,7,7,38,20,23,23,23,87,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,
+23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,41,40,7,7,7,38,42,42,43,23,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,57,55,56,7,7,7,7,22,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,21,37,58,58,53,69,7,7,7,7,68,52,59,23,57,53,69,7,7,7,68,71,71,74,75,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,57,53,69,7,7,7,7,7,7,7,7,7,38,20,73,69,7,7,7,7,7,38,20,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,
 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,57,56,7,7,7,54,55,58,59,23,23,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,73,71,72,7,7,7,7,22,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,21,37,53,74,74,69,7,7,7,7,121,7,68,75,23,73,69,7,7,7,7,7,109,7,7,22,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,73,69,7,7,109,7,7,7,7,7,123,7,54,36,40,7,126,7,7,7,7,54,36,42,20,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,
 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,73,72,7,7,7,70,71,74,75,23,23,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,23,24,7,7,7,7,6,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,41,37,53,69,123,7,7,7,7,7,7,7,7,7,22,23,24,7,7,7,7,7,7,7,7,7,38,20,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,24,7,7,7,7,123,7,7,7,7,7,7,70,52,56,7,7,7,7,7,121,70,52,58,36,43,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,
 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,24,7,7,7,7,7,7,7,22,23,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,23,24,7,7,6,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,57,53,69,7,7,7,7,7,7,7,7,7,7,7,38,39,40,7,7,7,123,7,7,7,7,7,54,36,42,43,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,24,7,7,7,7,7,7,7,7,7,7,7,7,68,72,7,7,7,7,123,7,7,68,74,52,59,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,
@@ -1230,54 +1230,54 @@
 </data>
  </layer>
  <objectgroup id="6" name="Objects" visible="0">
-  <object id="1" name="graphics/particles/flame.particle.xml" type="particle_effect" x="896" y="960" width="32" height="32"/>
-  <object id="2" name="graphics/particles/flame.particle.xml" type="particle_effect" x="1024" y="960" width="32" height="32"/>
-  <object id="3" name="graphics/particles/flame.particle.xml" type="particle_effect" x="2912" y="928" width="32" height="32"/>
-  <object id="4" name="graphics/particles/flame.particle.xml" type="particle_effect" x="3008" y="928" width="32" height="32"/>
-  <object id="5" name="graphics/particles/flame.particle.xml" type="particle_effect" x="3232" y="4480" width="32" height="32"/>
-  <object id="6" name="graphics/particles/flame.particle.xml" type="particle_effect" x="3104" y="4384" width="32" height="32"/>
-  <object id="7" name="graphics/particles/flame.particle.xml" type="particle_effect" x="3008" y="4704" width="32" height="32"/>
-  <object id="8" name="graphics/particles/flame.particle.xml" type="particle_effect" x="3168" y="4960" width="32" height="32"/>
-  <object id="9" name="graphics/particles/flame.particle.xml" type="particle_effect" x="3232" y="4960" width="32" height="32"/>
-  <object id="10" name="graphics/particles/flame.particle.xml" type="particle_effect" x="3744" y="4704" width="32" height="32"/>
-  <object id="11" name="graphics/particles/flame.particle.xml" type="particle_effect" x="3744" y="4480" width="32" height="32"/>
-  <object id="12" name="graphics/particles/flame.particle.xml" type="particle_effect" x="3648" y="4416" width="32" height="32"/>
-  <object id="13" name="graphics/particles/flame.particle.xml" type="particle_effect" x="3904" y="4512" width="32" height="32"/>
-  <object id="14" name="graphics/particles/flame.particle.xml" type="particle_effect" x="3904" y="4864" width="32" height="32"/>
-  <object id="15" name="To Rossy Main Hall" type="warp" x="896" y="1184" width="32" height="32">
+  <object id="1" name="graphics/particles/flame.particle.xml" class="particle_effect" x="896" y="960" width="32" height="32"/>
+  <object id="2" name="graphics/particles/flame.particle.xml" class="particle_effect" x="1024" y="960" width="32" height="32"/>
+  <object id="3" name="graphics/particles/flame.particle.xml" class="particle_effect" x="2912" y="928" width="32" height="32"/>
+  <object id="4" name="graphics/particles/flame.particle.xml" class="particle_effect" x="3008" y="928" width="32" height="32"/>
+  <object id="5" name="graphics/particles/flame.particle.xml" class="particle_effect" x="3232" y="4480" width="32" height="32"/>
+  <object id="6" name="graphics/particles/flame.particle.xml" class="particle_effect" x="3104" y="4384" width="32" height="32"/>
+  <object id="7" name="graphics/particles/flame.particle.xml" class="particle_effect" x="3008" y="4704" width="32" height="32"/>
+  <object id="8" name="graphics/particles/flame.particle.xml" class="particle_effect" x="3168" y="4960" width="32" height="32"/>
+  <object id="9" name="graphics/particles/flame.particle.xml" class="particle_effect" x="3232" y="4960" width="32" height="32"/>
+  <object id="10" name="graphics/particles/flame.particle.xml" class="particle_effect" x="3744" y="4704" width="32" height="32"/>
+  <object id="11" name="graphics/particles/flame.particle.xml" class="particle_effect" x="3744" y="4480" width="32" height="32"/>
+  <object id="12" name="graphics/particles/flame.particle.xml" class="particle_effect" x="3648" y="4416" width="32" height="32"/>
+  <object id="13" name="graphics/particles/flame.particle.xml" class="particle_effect" x="3904" y="4512" width="32" height="32"/>
+  <object id="14" name="graphics/particles/flame.particle.xml" class="particle_effect" x="3904" y="4864" width="32" height="32"/>
+  <object id="15" name="To Rossy Main Hall" class="warp" x="896" y="1184" width="32" height="32">
    <properties>
     <property name="dest_map" value="025-3"/>
     <property name="dest_tile_x" value="105"/>
     <property name="dest_tile_y" value="87"/>
    </properties>
   </object>
-  <object id="16" name="CaveMaggot" type="spawn" x="608" y="768" width="672" height="480">
+  <object id="16" name="CaveMaggot" class="spawn" x="608" y="768" width="672" height="480">
    <properties>
     <property name="eA_death" value="100"/>
     <property name="max_beings" value="3"/>
     <property name="monster_id" value="54"/>
    </properties>
   </object>
-  <object id="17" name="CaveMaggot" type="spawn" x="2688" y="448" width="672" height="704">
+  <object id="17" name="CaveMaggot" class="spawn" x="2688" y="448" width="672" height="704">
    <properties>
     <property name="eA_death" value="100"/>
     <property name="max_beings" value="5"/>
     <property name="monster_id" value="54"/>
    </properties>
   </object>
-  <object id="18" name="graphics/particles/flame.particle.xml" type="particle_effect" x="3232" y="4704" width="32" height="32"/>
-  <object id="19" name="graphics/particles/flame.particle.xml" type="particle_effect" x="3424" y="4256" width="32" height="32"/>
-  <object id="20" name="graphics/particles/flame.particle.xml" type="particle_effect" x="3488" y="4256" width="32" height="32"/>
-  <object id="21" name="graphics/particles/flame.particle.xml" type="particle_effect" x="4992" y="864" width="32" height="32"/>
-  <object id="22" name="graphics/particles/flame.particle.xml" type="particle_effect" x="4992" y="896" width="32" height="32"/>
-  <object id="23" name="graphics/particles/flame.particle.xml" type="particle_effect" x="4992" y="928" width="32" height="32"/>
-  <object id="24" name="graphics/particles/flame.particle.xml" type="particle_effect" x="5056" y="864" width="32" height="32"/>
-  <object id="25" name="graphics/particles/flame.particle.xml" type="particle_effect" x="5056" y="896" width="32" height="32"/>
-  <object id="26" name="graphics/particles/flame.particle.xml" type="particle_effect" x="5056" y="928" width="32" height="32"/>
-  <object id="27" name="graphics/particles/flame.particle.xml" type="particle_effect" x="5344" y="4768" width="32" height="32"/>
-  <object id="28" name="graphics/particles/flame.particle.xml" type="particle_effect" x="1440" y="5984" width="32" height="32"/>
-  <object id="29" name="graphics/particles/flame.particle.xml" type="particle_effect" x="1376" y="5984" width="32" height="32"/>
-  <object id="30" name="graphics/particles/flame.particle.xml" type="particle_effect" x="3328" y="6752" width="32" height="32"/>
-  <object id="31" name="graphics/particles/flame.particle.xml" type="particle_effect" x="3392" y="6752" width="32" height="32"/>
+  <object id="18" name="graphics/particles/flame.particle.xml" class="particle_effect" x="3232" y="4704" width="32" height="32"/>
+  <object id="19" name="graphics/particles/flame.particle.xml" class="particle_effect" x="3424" y="4256" width="32" height="32"/>
+  <object id="20" name="graphics/particles/flame.particle.xml" class="particle_effect" x="3488" y="4256" width="32" height="32"/>
+  <object id="21" name="graphics/particles/flame.particle.xml" class="particle_effect" x="4992" y="864" width="32" height="32"/>
+  <object id="22" name="graphics/particles/flame.particle.xml" class="particle_effect" x="4992" y="896" width="32" height="32"/>
+  <object id="23" name="graphics/particles/flame.particle.xml" class="particle_effect" x="4992" y="928" width="32" height="32"/>
+  <object id="24" name="graphics/particles/flame.particle.xml" class="particle_effect" x="5056" y="864" width="32" height="32"/>
+  <object id="25" name="graphics/particles/flame.particle.xml" class="particle_effect" x="5056" y="896" width="32" height="32"/>
+  <object id="26" name="graphics/particles/flame.particle.xml" class="particle_effect" x="5056" y="928" width="32" height="32"/>
+  <object id="27" name="graphics/particles/flame.particle.xml" class="particle_effect" x="5344" y="4768" width="32" height="32"/>
+  <object id="28" name="graphics/particles/flame.particle.xml" class="particle_effect" x="1440" y="5984" width="32" height="32"/>
+  <object id="29" name="graphics/particles/flame.particle.xml" class="particle_effect" x="1376" y="5984" width="32" height="32"/>
+  <object id="30" name="graphics/particles/flame.particle.xml" class="particle_effect" x="3328" y="6752" width="32" height="32"/>
+  <object id="31" name="graphics/particles/flame.particle.xml" class="particle_effect" x="3392" y="6752" width="32" height="32"/>
  </objectgroup>
 </map>
diff --git a/maps/026-1.tmx b/maps/026-1.tmx
index 0152e4ae..e15b5f4f 100644
--- a/maps/026-1.tmx
+++ b/maps/026-1.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.4" tiledversion="1.4.1" orientation="orthogonal" renderorder="right-down" width="150" height="120" tilewidth="32" tileheight="32" infinite="0" nextlayerid="10" nextobjectid="34">
+<map version="1.9" tiledversion="1.9.2" orientation="orthogonal" renderorder="right-down" width="150" height="120" tilewidth="32" tileheight="32" infinite="0" nextlayerid="10" nextobjectid="34">
  <properties>
   <property name="minimap" value="graphics/minimaps/026-1.png"/>
   <property name="music" value="graveyard.ogg"/>
@@ -120,10 +120,10 @@
 35,35,3,51,19,67,627,663,710,629,35,35,3,51,19,3,51,51,19,67,19,3,675,663,646,660,660,661,35,35,643,710,629,51,19,51,19,51,19,67,51,19,67,691,644,645,3,51,19,3,51,51,19,707,709,3,51,3,51,19,51,19,67,19,3,627,663,644,644,644,646,661,35,675,628,663,644,644,644,694,708,695,693,51,19,35,1044,1045,1045,1045,1048,1026,1027,3,51,19,3,51,19,3,51,51,19,67,19,3,51,3,51,19,67,67,627,628,629,3,3,51,3,51,67,67,67,35,67,3,19,35,35,51,19,19,3,35,19,35,19,19,19,35,35,3,67,67,19,67,35,35,19,51,
 51,19,51,19,3,51,643,644,644,710,629,19,67,35,3,35,35,3,35,35,3,675,663,646,661,3,3,51,51,19,659,695,645,35,3,51,3,51,19,19,3,51,19,691,644,693,35,35,3,35,35,3,35,35,3,35,35,35,35,3,3,35,35,3,627,663,644,644,646,660,661,51,19,659,647,644,696,644,694,709,51,707,709,3,35,1025,1047,1045,1045,1045,1045,1045,1048,1027,35,3,35,35,3,35,67,35,35,35,3,35,35,35,627,628,629,67,643,646,661,3,67,3,67,19,67,67,35,19,19,19,3,19,19,3,19,3,3,51,67,3,67,67,35,19,3,19,35,35,51,67,19,3,3,67,
 35,3,35,3,35,627,663,644,644,644,710,629,3,19,67,51,19,67,51,19,67,659,660,661,19,67,35,35,3,35,35,643,710,629,67,35,35,35,3,3,35,35,3,691,644,645,51,19,67,51,19,67,51,19,67,51,19,51,19,67,67,51,19,67,659,660,647,644,645,51,19,51,19,3,643,644,712,713,645,51,3,3,35,3,35,1063,1066,1045,1045,1045,1045,1045,1067,1065,19,67,51,19,67,67,35,35,51,19,67,51,19,51,643,644,710,628,663,645,67,3,3,3,51,51,19,19,35,3,3,43,44,3,3,67,35,67,35,51,3,3,67,67,3,67,35,67,3,67,51,19,3,3,19,35,
-19,67,19,67,51,643,644,644,644,712,644,645,67,51,19,51,627,628,629,19,3,51,19,3,51,19,51,19,67,51,19,659,695,710,629,19,51,19,67,627,629,19,67,707,695,710,676,677,19,51,19,3,51,19,3,51,19,3,51,19,3,51,19,3,51,627,663,646,661,35,3,35,3,627,663,644,644,644,645,3,35,19,35,3,35,51,1063,1064,1066,1045,1045,1045,1046,3,51,19,3,51,19,67,35,19,51,19,3,51,19,3,659,660,647,644,644,710,628,629,3,3,67,67,67,19,51,51,19,51,19,19,67,35,35,51,35,67,3,67,35,35,67,67,35,67,3,35,67,3,19,67,51,67,
+19,67,19,67,51,643,644,644,644,0,644,645,67,51,19,51,627,628,629,19,3,51,19,3,51,19,51,19,67,51,19,659,695,710,629,19,51,19,67,627,629,19,67,707,695,710,676,677,19,51,19,3,51,19,3,51,19,3,51,19,3,51,19,3,51,627,663,646,661,35,3,35,3,627,663,644,644,644,645,3,35,19,35,3,35,51,1063,1064,1066,1045,1045,1045,1046,3,51,19,3,51,19,67,35,19,51,19,3,51,19,3,659,660,647,644,644,710,628,629,3,3,67,67,67,19,51,51,19,51,19,19,67,35,35,51,35,67,3,67,35,35,67,67,35,67,3,35,67,3,19,67,51,67,
 51,19,3,51,19,659,647,644,712,696,644,710,629,35,3,35,643,644,662,629,35,35,3,35,35,3,3,51,19,3,51,51,643,644,645,3,51,3,627,663,645,3,51,19,691,644,692,662,677,35,3,35,35,3,35,35,3,35,35,3,35,35,3,35,35,659,647,645,51,19,67,627,628,663,644,644,644,644,710,677,3,35,67,35,3,1270,3,35,1044,1045,1045,1067,1065,35,35,3,35,35,3,51,19,35,35,3,35,35,3,35,35,3,659,647,644,646,660,661,19,3,51,67,3,3,19,35,3,3,3,51,3,51,3,19,51,51,3,35,3,67,51,67,3,35,51,67,19,3,19,3,3,19,
 35,3,51,19,3,35,643,644,644,644,644,644,662,629,3,627,663,644,644,710,629,19,67,51,19,67,35,35,3,35,35,3,659,695,710,677,35,35,643,646,661,35,35,3,659,660,695,644,693,19,3,51,19,67,51,19,67,627,628,677,51,19,67,51,19,627,663,645,3,3,51,707,708,695,644,644,644,644,644,662,677,19,51,19,67,19,3,51,1063,1066,1067,1065,67,51,19,67,51,19,67,19,3,51,19,67,51,19,67,51,19,67,3,659,660,661,19,51,67,3,67,67,67,3,19,35,35,3,19,35,67,67,19,67,19,19,19,3,51,19,35,35,35,35,67,3,3,35,35,67,35,51,
-19,35,35,3,67,3,659,660,647,644,644,644,644,645,3,643,644,644,694,695,662,677,19,3,51,19,51,19,67,51,19,67,51,659,644,645,19,627,663,645,3,51,19,51,19,3,707,708,709,19,35,35,3,3,51,19,627,663,694,709,35,3,3,51,19,659,660,661,35,35,35,3,51,691,644,644,694,708,695,694,709,3,3,3,51,19,35,35,3,1063,1065,19,627,629,51,19,3,3,51,19,35,35,3,3,51,19,19,3,51,19,35,3,3,67,19,51,19,67,51,19,3,51,51,3,3,51,51,3,67,3,3,19,51,67,19,67,67,19,67,35,3,19,51,3,19,67,67,67,3,67,
+19,35,35,3,67,3,659,660,647,644,644,644,712,645,3,643,644,644,694,695,662,677,19,3,51,19,51,19,67,51,19,67,51,659,644,645,19,627,663,645,3,51,19,51,19,3,707,708,709,19,35,35,3,3,51,19,627,663,694,709,35,3,3,51,19,659,660,661,35,35,35,3,51,691,644,644,694,708,695,694,709,3,3,3,51,19,35,35,3,1063,1065,19,627,629,51,19,3,3,51,19,35,35,3,3,51,19,19,3,51,19,35,3,3,67,19,51,19,67,51,19,3,51,51,3,3,51,51,3,67,3,3,19,51,67,19,67,67,19,67,35,3,19,51,3,19,67,67,67,3,67,
 51,51,19,67,3,35,35,3,659,660,647,644,644,662,628,663,694,708,709,707,695,693,3,35,35,3,3,51,1270,51,19,3,51,19,695,710,628,663,646,661,35,35,3,35,3,35,35,35,35,3,51,19,67,35,627,628,663,694,709,3,19,67,35,35,3,3,35,35,3,51,19,51,627,711,644,694,709,51,707,709,19,67,35,35,35,67,51,19,67,35,675,677,643,662,628,677,35,35,35,3,51,19,67,35,35,3,3,35,35,3,35,67,67,51,67,67,67,3,3,3,67,67,3,35,35,19,35,51,35,35,67,3,67,67,19,19,67,19,35,35,3,19,51,3,35,51,67,3,35,67,
 35,3,35,35,3,51,19,67,35,35,659,647,644,644,644,644,693,3,51,19,707,709,19,51,19,67,35,35,3,35,3,35,35,3,659,695,646,660,661,3,51,19,67,19,67,51,3,51,19,51,19,3,51,19,659,647,644,710,629,67,3,51,19,3,51,19,51,19,35,35,3,627,711,694,708,709,35,35,3,35,67,67,67,3,35,19,19,19,51,19,691,710,711,644,644,645,3,51,19,51,19,3,51,19,3,51,19,51,19,67,19,3,19,67,19,35,67,3,67,67,3,19,3,35,67,19,3,67,67,3,3,35,19,19,19,19,35,35,19,3,19,35,67,67,51,19,19,67,35,51,
 19,67,51,19,35,35,3,51,19,51,19,643,644,644,644,644,710,677,35,3,19,35,3,35,35,3,51,19,67,19,3,51,19,67,51,659,661,51,19,67,3,51,19,3,51,19,35,35,3,35,3,35,35,3,35,659,647,646,661,3,35,35,1270,35,35,3,35,35,51,19,67,707,708,709,19,67,51,19,19,67,51,51,35,35,19,3,35,35,35,3,691,644,644,644,644,710,629,35,3,35,3,35,35,3,35,35,3,35,35,3,67,3,67,35,35,35,19,3,19,19,59,60,3,35,19,35,3,67,3,3,19,3,67,19,35,19,35,67,51,19,35,3,19,35,67,67,51,35,19,67,
@@ -509,7 +509,7 @@
 0,0,0,0,0,0,0,293,294,0,0,0,0,0,582,583,584,0,293,294,0,0,0,0,0,0,0,275,0,291,292,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,906,907,908,269,0,0,0,0,0,597,598,269,0,0,0,0,0,0,0,0,0,0,278,279,0,0,0,0,0,0,0,0,0,0,585,586,587,0,0,0,0,0,0,0,0,0,0,0,0,291,292,0,0,0,291,292,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,585,586,587,0,582,583,584,0,0,291,292,0,579,580,581,0,0,579,580,581,0,582,583,584,0,0,0,295,296,0,0,293,294,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,275,0,291,292,0,0,0,0,0,0,293,294,0,0,0,0,0,0,0,0,0,293,294,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,291,292,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,597,598,0,293,294,0,583,0,0,0,0,0,0,0,0,0,0,0,293,294,0,0,0,0,0,0,0,0,0,0,295,296,0,0,0,0,583,584,0,0,0,579,580,581,55,293,294,295,296,
 0,0,0,291,292,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,585,586,587,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,597,598,0,0,0,0,275,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,579,580,581,278,279,0,0,0,0,0,0,0,0,0,0,0,585,586,587,0,0,0,293,294,291,292,0,0,0,0,0,291,292,293,294,0,295,296,0,0,0,579,580,581,0,0,0,579,580,581,0,582,583,584,579,580,581,0,0,0,0,0,0,293,
-580,581,0,0,0,0,0,295,296,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,291,292,295,296,0,0,263,0,0,0,0,0,0,0,0,0,597,598,0,0,0,0,0,0,0,291,292,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,293,294,0,291,292,0,0,0,0,278,279,0,0,0,0,0,0,0,0,0,0,0,0,0,293,294,0,0,0,293,294,0,0,0,0,0,0,0,0,0,0,293,294,0,0,0,0,293,294,0,0,0,0,293,294,0,0,293,294,0,0,0,0,0,293,294,582,583,584,0,582,583,584,291,292,0,0,291,292,0,0,
+580,581,0,0,0,0,0,295,296,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,291,292,295,296,0,0,0,0,0,0,0,0,0,0,0,0,597,598,0,0,0,0,0,0,0,291,292,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,293,294,0,291,292,0,0,0,0,278,279,0,0,0,0,0,0,0,0,0,0,0,0,0,293,294,0,0,0,293,294,0,0,0,0,0,0,0,0,0,0,293,294,0,0,0,0,293,294,0,0,0,0,293,294,0,0,293,294,0,0,0,0,0,293,294,582,583,584,0,582,583,584,291,292,0,0,291,292,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,585,586,587,0,0,0,0,0,0,0,0,0,0,0,0,0,0,293,294,276,277,0,293,294,0,0,0,280,281,0,0,0,0,269,0,0,0,0,0,0,0,0,582,583,584,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,293,294,0,0,0,0,0,0,311,312,0,0,0,0,291,292,0,0,0,0,886,887,0,0,0,0,295,296,291,292,0,0,0,0,0,0,55,0,295,296,0,0,291,292,0,0,291,292,0,0,0,582,583,584,0,0,0,0,579,580,581,293,294,293,
 0,0,0,0,0,0,0,0,0,0,321,322,0,0,0,0,276,277,0,0,0,0,0,0,0,597,598,0,886,887,888,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,293,294,0,0,886,887,888,0,0,0,0,0,0,0,0,0,597,598,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,291,292,0,0,0,0,0,585,586,587,0,0,0,291,292,0,896,897,0,0,0,295,296,0,0,0,0,0,295,296,579,580,581,0,0,0,0,0,0,293,294,0,0,0,55,0,0,0,0,0,293,294,0,0,0,0,585,586,587,0,
 0,293,294,0,0,0,0,291,292,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,896,897,898,0,0,273,274,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,896,897,898,0,293,294,0,0,0,0,0,0,0,0,291,292,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,293,294,0,0,0,0,595,596,0,0,0,0,0,579,580,581,907,0,0,295,296,291,292,0,295,296,0,0,295,296,0,0,293,294,0,0,0,295,296,0,55,0,0,0,0,579,580,581,293,294,0,291,292,0,0,0,0,293,294,
@@ -891,7 +891,7 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 </data>
  </layer>
- <layer id="8" name="Collision" width="150" height="120" visible="0">
+ <layer id="8" name="Collision" width="150" height="120">
   <data encoding="csv">
 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
@@ -1016,21 +1016,21 @@
 </data>
  </layer>
  <objectgroup id="9" name="Objects" visible="0">
-  <object id="1" name="To Graveyard" type="warp" x="2016" y="512" width="32" height="32">
+  <object id="1" name="To Graveyard" class="warp" x="2016" y="512" width="32" height="32">
    <properties>
     <property name="dest_map" value="027-1"/>
     <property name="dest_tile_x" value="63"/>
     <property name="dest_tile_y" value="105"/>
    </properties>
   </object>
-  <object id="2" name="To Woodland Swamp" type="warp" x="4128" y="2112" width="32" height="32">
+  <object id="2" name="To Woodland Swamp" class="warp" x="4128" y="2112" width="32" height="32">
    <properties>
     <property name="dest_map" value="025-1"/>
     <property name="dest_tile_x" value="20"/>
     <property name="dest_tile_y" value="66"/>
    </properties>
   </object>
-  <object id="3" name="Wisp" type="spawn" x="0" y="0">
+  <object id="3" name="Wisp" class="spawn" x="0" y="0">
    <properties>
     <property name="eA_death" value="40000"/>
     <property name="eA_spawn" value="120000"/>
@@ -1038,7 +1038,7 @@
     <property name="monster_id" value="38"/>
    </properties>
   </object>
-  <object id="4" name="Spectre" type="spawn" x="0" y="0">
+  <object id="4" name="Spectre" class="spawn" x="0" y="0">
    <properties>
     <property name="eA_death" value="40000"/>
     <property name="eA_spawn" value="120000"/>
@@ -1046,7 +1046,7 @@
     <property name="monster_id" value="40"/>
    </properties>
   </object>
-  <object id="5" name="Poltergeist" type="spawn" x="0" y="0">
+  <object id="5" name="Poltergeist" class="spawn" x="0" y="0">
    <properties>
     <property name="eA_death" value="40000"/>
     <property name="eA_spawn" value="120000"/>
@@ -1054,7 +1054,7 @@
     <property name="monster_id" value="45"/>
    </properties>
   </object>
-  <object id="6" name="Silkworm" type="spawn" x="0" y="0">
+  <object id="6" name="Silkworm" class="spawn" x="0" y="0">
    <properties>
     <property name="eA_death" value="60000"/>
     <property name="eA_spawn" value="300000"/>
@@ -1062,7 +1062,7 @@
     <property name="monster_id" value="33"/>
    </properties>
   </object>
-  <object id="8" name="LogHead" type="spawn" x="0" y="0">
+  <object id="8" name="LogHead" class="spawn" x="0" y="0">
    <properties>
     <property name="eA_death" value="40000"/>
     <property name="eA_spawn" value="300000"/>
@@ -1070,14 +1070,14 @@
     <property name="monster_id" value="23"/>
    </properties>
   </object>
-  <object id="19" name="To Reid's Inn" type="warp" x="1536" y="1248" width="32" height="32">
+  <object id="19" name="To Reid's Inn" class="warp" x="1536" y="1248" width="32" height="32">
    <properties>
     <property name="dest_map" value="026-2"/>
     <property name="dest_tile_x" value="29"/>
     <property name="dest_tile_y" value="33"/>
    </properties>
   </object>
-  <object id="20" name="DrunkenSkeleton" type="spawn" x="672" y="768" width="1824" height="480">
+  <object id="20" name="DrunkenSkeleton" class="spawn" x="672" y="768" width="1824" height="480">
    <properties>
     <property name="eA_death" value="30000"/>
     <property name="eA_spawn" value="100000"/>
@@ -1085,7 +1085,7 @@
     <property name="monster_id" value="75"/>
    </properties>
   </object>
-  <object id="21" name="TipsySkeleton" type="spawn" x="768" y="832" width="1696" height="384">
+  <object id="21" name="TipsySkeleton" class="spawn" x="768" y="832" width="1696" height="384">
    <properties>
     <property name="eA_death" value="30000"/>
     <property name="eA_spawn" value="100000"/>
@@ -1093,7 +1093,7 @@
     <property name="monster_id" value="76"/>
    </properties>
   </object>
-  <object id="22" name="DrunkenSkeleton" type="spawn" x="736" y="1984" width="2150" height="992">
+  <object id="22" name="DrunkenSkeleton" class="spawn" x="736" y="1984" width="2150" height="992">
    <properties>
     <property name="eA_death" value="30000"/>
     <property name="eA_spawn" value="100000"/>
@@ -1101,7 +1101,7 @@
     <property name="monster_id" value="75"/>
    </properties>
   </object>
-  <object id="23" name="TipsySkeleton" type="spawn" x="896" y="2112" width="1930" height="770">
+  <object id="23" name="TipsySkeleton" class="spawn" x="896" y="2112" width="1930" height="770">
    <properties>
     <property name="eA_death" value="30000"/>
     <property name="eA_spawn" value="100000"/>
@@ -1109,7 +1109,7 @@
     <property name="monster_id" value="76"/>
    </properties>
   </object>
-  <object id="24" name="DrunkenSkeleton" type="spawn" x="3040" y="704" width="1024" height="2400">
+  <object id="24" name="DrunkenSkeleton" class="spawn" x="3040" y="704" width="1024" height="2400">
    <properties>
     <property name="eA_death" value="30000"/>
     <property name="eA_spawn" value="100000"/>
@@ -1117,7 +1117,7 @@
     <property name="monster_id" value="75"/>
    </properties>
   </object>
-  <object id="25" name="TipsySkeleton" type="spawn" x="3072" y="768" width="928" height="2304">
+  <object id="25" name="TipsySkeleton" class="spawn" x="3072" y="768" width="928" height="2304">
    <properties>
     <property name="eA_death" value="30000"/>
     <property name="eA_spawn" value="100000"/>
@@ -1125,21 +1125,21 @@
     <property name="monster_id" value="76"/>
    </properties>
   </object>
-  <object id="28" name="To Shops" type="warp" x="1376" y="768" width="32" height="32">
+  <object id="28" name="To Shops" class="warp" x="1376" y="768" width="32" height="32">
    <properties>
     <property name="dest_map" value="026-2"/>
     <property name="dest_tile_x" value="31"/>
     <property name="dest_tile_y" value="128"/>
    </properties>
   </object>
-  <object id="29" name="To House" type="warp" x="800" y="640" width="32" height="32">
+  <object id="29" name="To House" class="warp" x="800" y="640" width="32" height="32">
    <properties>
     <property name="dest_map" value="026-2"/>
     <property name="dest_tile_x" value="22"/>
     <property name="dest_tile_y" value="95"/>
    </properties>
   </object>
-  <object id="31" name="DrunkenLadySkeleton" type="spawn" x="3040" y="704" width="1024" height="2400">
+  <object id="31" name="DrunkenLadySkeleton" class="spawn" x="3040" y="704" width="1024" height="2400">
    <properties>
     <property name="eA_death" value="30000"/>
     <property name="eA_spawn" value="100000"/>
@@ -1147,7 +1147,7 @@
     <property name="monster_id" value="77"/>
    </properties>
   </object>
-  <object id="32" name="DrunkenLadySkeleton" type="spawn" x="736" y="2016" width="2240" height="1056">
+  <object id="32" name="DrunkenLadySkeleton" class="spawn" x="736" y="2016" width="2240" height="1056">
    <properties>
     <property name="eA_death" value="30000"/>
     <property name="eA_spawn" value="100000"/>
@@ -1155,7 +1155,7 @@
     <property name="monster_id" value="77"/>
    </properties>
   </object>
-  <object id="33" name="DrunkenLadySkeleton" type="spawn" x="672" y="800" width="1760" height="416">
+  <object id="33" name="DrunkenLadySkeleton" class="spawn" x="672" y="800" width="1760" height="416">
    <properties>
     <property name="eA_death" value="30000"/>
     <property name="eA_spawn" value="100000"/>
diff --git a/maps/030-4.tmx b/maps/030-4.tmx
index 2be06bc3..006589f6 100644
--- a/maps/030-4.tmx
+++ b/maps/030-4.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.0" orientation="orthogonal" width="70" height="70" tilewidth="32" tileheight="32">
+<map version="1.9" tiledversion="1.9.2" orientation="orthogonal" renderorder="right-down" width="70" height="70" tilewidth="32" tileheight="32" infinite="0" nextlayerid="8" nextobjectid="1">
  <properties>
   <property name="music" value="white-christmas.ogg"/>
   <property name="name" value="Christmas Inn Warehouse"/>
@@ -8,9 +8,9 @@
  <tileset firstgid="3" source="../tilesets/inn.tsx"/>
  <tileset firstgid="259" source="../tilesets/inn2.tsx"/>
  <tileset firstgid="515" source="../tilesets/inn_x2.tsx"/>
- <tileset firstgid="547" source="../tilesets/inn_x3.tsx"/>
- <tileset firstgid="595" source="../tilesets/inn_x4.tsx"/>
- <layer name="Ground1" width="70" height="70">
+ <tileset firstgid="563" source="../tilesets/inn_x3.tsx"/>
+ <tileset firstgid="643" source="../tilesets/inn_x4.tsx"/>
+ <layer id="1" name="Ground1" width="70" height="70">
   <data encoding="csv">
 249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,
 249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,
@@ -84,7 +84,7 @@
 249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249
 </data>
  </layer>
- <layer name="Ground2" width="70" height="70">
+ <layer id="2" name="Ground2" width="70" height="70">
   <data encoding="csv">
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -158,7 +158,7 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 </data>
  </layer>
- <layer name="Fringe" width="70" height="70">
+ <layer id="3" name="Fringe" width="70" height="70">
   <data encoding="csv">
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -184,10 +184,10 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,142,0,0,0,0,0,0,0,0,524,525,142,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,158,0,0,0,0,0,0,0,524,525,0,158,0,291,292,293,0,0,291,292,293,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,174,0,0,0,0,0,0,0,0,0,0,174,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,595,596,597,596,595,596,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,643,644,645,646,643,644,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,291,292,293,0,0,291,292,293,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,595,598,595,596,597,598,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,645,646,643,644,645,646,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,78,0,0,0,0,0,0,0,0,0,0,78,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,94,0,0,0,0,0,0,0,0,0,0,94,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -195,11 +195,11 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,142,0,0,0,0,0,0,0,0,0,0,142,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,524,525,524,525,0,0,0,0,158,0,0,0,0,0,0,0,0,0,0,158,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,524,525,0,0,0,0,0,0,0,174,0,0,0,0,0,0,0,0,0,0,174,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,524,525,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,567,568,0,0,565,566,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,524,525,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,583,584,0,0,581,582,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,524,525,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,565,568,0,0,567,568,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,581,584,0,0,583,584,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,78,0,0,0,0,0,0,0,0,0,0,78,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,94,0,0,0,0,0,0,0,0,0,0,94,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -232,7 +232,7 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 </data>
  </layer>
- <layer name="Over1" width="70" height="70">
+ <layer id="4" name="Over1" width="70" height="70">
   <data encoding="csv">
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -306,7 +306,7 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 </data>
  </layer>
- <layer name="Over2" width="70" height="70">
+ <layer id="5" name="Over2" width="70" height="70">
   <data encoding="csv">
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -380,7 +380,7 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 </data>
  </layer>
- <layer name="Collision" width="70" height="70">
+ <layer id="6" name="Collision" width="70" height="70" visible="0">
   <data encoding="csv">
 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
@@ -454,5 +454,5 @@
 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2
 </data>
  </layer>
- <objectgroup name="Objects" visible="0"/>
+ <objectgroup id="7" name="Objects" visible="0"/>
 </map>
diff --git a/maps/041-1.tmx b/maps/041-1.tmx
index c1a67a50..47ace9a9 100644
--- a/maps/041-1.tmx
+++ b/maps/041-1.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.0" orientation="orthogonal" width="150" height="125" tilewidth="32" tileheight="32">
+<map version="1.9" tiledversion="1.9.2" orientation="orthogonal" renderorder="right-down" width="150" height="125" tilewidth="32" tileheight="32" infinite="0" nextlayerid="9" nextobjectid="14">
  <properties>
   <property name="music" value="faith.ogg"/>
   <property name="name" value="Beach"/>
@@ -17,7 +17,7 @@
  <tileset firstgid="1137" source="../tilesets/water.tsx"/>
  <tileset firstgid="1302" source="../tilesets/waterflow.tsx"/>
  <tileset firstgid="1374" source="../tilesets/signs_x2.tsx"/>
- <layer name="Ground1" width="150" height="125">
+ <layer id="1" name="Ground1" width="150" height="125">
   <data encoding="csv">
 1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1300,1282,3,3,358,359,360,3,3,3,3,3,3,3,955,955,955,955,955,955,955,955,955,955,3,3,955,955,955,955,955,3,3,3,3,3,3,3,120,121,135,38,135,135,135,136,137,151,151,151,54,151,151,151,54,151,151,151,151,54,151,151,151,151,152,137,151,151,151,151,150,151,151,151,151,54,151,152,137,151,151,152,425,167,167,167,167,167,167,150,151,151,151,151,151,152,154,
 1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1300,1282,3,3,358,359,360,3,3,3,3,3,3,3,955,955,955,955,955,955,955,955,955,955,955,955,955,955,955,955,955,120,121,135,38,135,135,135,136,137,151,54,151,151,151,152,137,151,151,151,54,151,151,151,151,151,54,151,151,151,151,54,151,151,152,153,167,167,167,70,150,151,54,151,151,151,151,152,153,167,167,168,441,3,3,3,3,3,3,166,167,167,167,167,167,168,170,
@@ -146,7 +146,7 @@
 1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1300,1282,3,3,3,165,166,167,70,167,167,150,151,151,54,151,151,54,151,152,153,167,70,167,168,169,3,3,3,358,359,360,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,149,213,217,348,348,348,348,348,348,348,348,348,348,348,348,348,348,348,348,348,348,348,348,339,404,404,404,404,404,404
 </data>
  </layer>
- <layer name="Ground2" width="150" height="125">
+ <layer id="2" name="Ground2" width="150" height="125">
   <data encoding="csv">
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1279,1274,914,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,928,942,943,0,0,941,929,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1279,1274,914,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,928,942,942,929,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -275,7 +275,7 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1279,1274,914,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 </data>
  </layer>
- <layer name="Ground3" width="150" height="125">
+ <layer id="3" name="Ground3" width="150" height="125">
   <data encoding="csv">
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1073,1073,1073,1073,1073,1073,1073,1082,1082,1082,0,0,1091,1073,1073,1073,1073,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1073,1073,1073,1073,1073,1073,1073,1073,1073,1073,1073,1082,1073,1073,1073,1073,1073,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -404,7 +404,7 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 </data>
  </layer>
- <layer name="Fringe" width="150" height="125">
+ <layer id="4" name="Fringe" width="150" height="125">
   <data encoding="csv">
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,595,596,597,0,0,101,966,0,0,0,0,0,0,935,951,952,0,0,950,936,0,0,968,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,138,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,101,982,920,0,0,919,983,983,983,920,935,951,951,936,0,919,983,984,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -514,8 +514,8 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,101,0,598,599,600,0,0,0,0,0,0,0,0,0,0,0,0,0,0,595,596,597,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,681,0,0,0,0,0,0,0,0,0,0,0,672,0,0,105,0,0,0,0,0,0,0,0,0,0,1037,0,1008,0,0,0,0,0,0,0,0,522,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,102,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,523,0,681,0,0,0,0,0,0,0,0,0,0,0,682,0,0,106,0,0,0,0,0,0,0,0,0,0,1017,0,1008,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,101,0,0,0,0,0,0,0,0,0,598,599,600,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,697,0,0,0,0,0,0,0,0,0,0,0,698,0,0,105,0,0,0,665,0,0,0,0,0,666,1017,0,1008,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,102,600,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,595,596,515,516,0,0,633,0,0,0,0,0,0,0,0,0,0,0,636,0,0,106,0,0,0,681,0,0,0,0,0,682,1017,0,1038,0,681,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,101,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,649,651,650,650,650,650,650,650,650,650,650,700,652,0,0,106,0,0,0,697,0,0,0,0,0,698,1017,0,1038,0,681,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,102,600,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,515,516,0,0,633,0,0,0,0,0,0,0,0,0,0,0,636,0,0,106,0,0,0,681,0,0,0,0,0,682,1017,0,1038,0,681,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,101,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,595,596,597,0,0,0,649,651,650,650,650,650,650,650,650,650,650,700,652,0,0,106,0,0,0,697,0,0,0,0,0,698,1017,0,1038,0,681,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,21,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,106,0,0,0,633,0,0,0,0,0,636,1017,0,1038,0,681,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,102,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,598,599,600,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,598,599,600,0,0,0,0,0,0,106,0,0,0,649,650,650,650,650,650,652,1017,0,1038,0,681,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,101,0,598,599,600,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,598,599,600,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,104,0,0,0,0,0,0,0,0,0,0,1027,0,988,0,697,0,0,0,0,0,0,0,
@@ -533,7 +533,7 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 </data>
  </layer>
- <layer name="Over1" width="150" height="125">
+ <layer id="5" name="Over1" width="150" height="125">
   <data encoding="csv">
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -643,7 +643,7 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,601,602,602,602,603,603,604,0,0,0,0,0,623,629,629,630,629,629,629,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,601,659,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,598,599,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,597,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,598,599,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -662,7 +662,7 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,336,336,336,336,336,336
 </data>
  </layer>
- <layer name="Over2" width="150" height="125">
+ <layer id="6" name="Over2" width="150" height="125">
   <data encoding="csv">
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -791,7 +791,7 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,340,0,0,0,0,0
 </data>
  </layer>
- <layer name="Collision" width="150" height="125">
+ <layer id="7" name="Collision" width="150" height="125" visible="0">
   <data encoding="csv">
 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
@@ -920,8 +920,8 @@
 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2
 </data>
  </layer>
- <objectgroup name="Object">
-  <object name="Scorpion" type="spawn" x="2304" y="1632" width="608" height="320">
+ <objectgroup id="8" name="Object" visible="0">
+  <object id="1" name="Scorpion" class="spawn" x="2304" y="1632" width="608" height="320">
    <properties>
     <property name="eA_death" value="30000"/>
     <property name="eA_spawn" value="100000"/>
@@ -929,7 +929,7 @@
     <property name="monster_id" value="1"/>
    </properties>
   </object>
-  <object name="Scorpion" type="spawn" x="2944" y="2016" width="608" height="320">
+  <object id="2" name="Scorpion" class="spawn" x="2944" y="2016" width="608" height="320">
    <properties>
     <property name="eA_death" value="30000"/>
     <property name="eA_spawn" value="100000"/>
@@ -937,7 +937,7 @@
     <property name="monster_id" value="1"/>
    </properties>
   </object>
-  <object name="Scorpion" type="spawn" x="2912" y="2560" width="608" height="320">
+  <object id="3" name="Scorpion" class="spawn" x="2912" y="2560" width="608" height="320">
    <properties>
     <property name="eA_death" value="30000"/>
     <property name="eA_spawn" value="100000"/>
@@ -945,7 +945,7 @@
     <property name="monster_id" value="1"/>
    </properties>
   </object>
-  <object name="Scorpion" type="spawn" x="1760" y="768" width="448" height="672">
+  <object id="4" name="Scorpion" class="spawn" x="1760" y="768" width="448" height="672">
    <properties>
     <property name="eA_death" value="30000"/>
     <property name="eA_spawn" value="100000"/>
@@ -953,7 +953,7 @@
     <property name="monster_id" value="1"/>
    </properties>
   </object>
-  <object name="SeaSlime" type="spawn" x="1600" y="192" width="352" height="1568">
+  <object id="5" name="SeaSlime" class="spawn" x="1600" y="192" width="352" height="1568">
    <properties>
     <property name="eA_death" value="30000"/>
     <property name="eA_spawn" value="100000"/>
@@ -961,7 +961,7 @@
     <property name="monster_id" value="31"/>
    </properties>
   </object>
-  <object name="Scorpion" type="spawn" x="1728" y="288" width="352" height="320">
+  <object id="6" name="Scorpion" class="spawn" x="1728" y="288" width="352" height="320">
    <properties>
     <property name="eA_death" value="30000"/>
     <property name="eA_spawn" value="100000"/>
@@ -969,7 +969,7 @@
     <property name="monster_id" value="1"/>
    </properties>
   </object>
-  <object name="TameScorpion" type="spawn" x="1888" y="192" width="128" height="96">
+  <object id="7" name="TameScorpion" class="spawn" x="1888" y="192" width="128" height="96">
    <properties>
     <property name="eA_death" value="30000"/>
     <property name="eA_spawn" value="100000"/>
@@ -977,7 +977,7 @@
     <property name="monster_id" value="44"/>
    </properties>
   </object>
-  <object name="TameScorpion" type="spawn" x="2080" y="1536" width="128" height="96">
+  <object id="8" name="TameScorpion" class="spawn" x="2080" y="1536" width="128" height="96">
    <properties>
     <property name="eA_death" value="30000"/>
     <property name="eA_spawn" value="100000"/>
@@ -985,7 +985,7 @@
     <property name="monster_id" value="44"/>
    </properties>
   </object>
-  <object name="TameScorpion" type="spawn" x="2720" y="2272" width="704" height="320">
+  <object id="9" name="TameScorpion" class="spawn" x="2720" y="2272" width="704" height="320">
    <properties>
     <property name="eA_death" value="30000"/>
     <property name="eA_spawn" value="100000"/>
@@ -993,7 +993,7 @@
     <property name="monster_id" value="44"/>
    </properties>
   </object>
-  <object name="RedScorpion" type="spawn" x="2912" y="1696" width="608" height="320">
+  <object id="10" name="RedScorpion" class="spawn" x="2912" y="1696" width="608" height="320">
    <properties>
     <property name="eA_death" value="30000"/>
     <property name="eA_spawn" value="100000"/>
@@ -1001,7 +1001,7 @@
     <property name="monster_id" value="2"/>
    </properties>
   </object>
-  <object name="RedScorpion" type="spawn" x="2368" y="1920" width="608" height="320">
+  <object id="11" name="RedScorpion" class="spawn" x="2368" y="1920" width="608" height="320">
    <properties>
     <property name="eA_death" value="30000"/>
     <property name="eA_spawn" value="100000"/>
@@ -1009,14 +1009,14 @@
     <property name="monster_id" value="2"/>
    </properties>
   </object>
-  <object name="To Beach" type="warp" x="3200" y="3040" width="96" height="32">
+  <object id="12" name="To Beach" class="warp" x="3200" y="3040" width="96" height="32">
    <properties>
     <property name="dest_map" value="004-1"/>
     <property name="dest_tile_x" value="68"/>
     <property name="dest_tile_y" value="20"/>
    </properties>
   </object>
-  <object name="To Tulimshar Suburbs" type="warp" x="1824" y="128" width="96" height="32">
+  <object id="13" name="To Tulimshar Suburbs" class="warp" x="1824" y="128" width="96" height="32">
    <properties>
     <property name="dest_map" value="042-1"/>
     <property name="dest_tile_x" value="44"/>
diff --git a/maps/042-1.tmx b/maps/042-1.tmx
index fcc29933..899241c4 100644
--- a/maps/042-1.tmx
+++ b/maps/042-1.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.0" tiledversion="1.1.4" orientation="orthogonal" renderorder="right-down" width="160" height="141" tilewidth="32" tileheight="32" infinite="0" nextobjectid="24">
+<map version="1.9" tiledversion="1.9.2" orientation="orthogonal" renderorder="right-down" width="160" height="141" tilewidth="32" tileheight="32" infinite="0" nextlayerid="10" nextobjectid="24">
  <properties>
   <property name="music" value="peace.ogg"/>
   <property name="name" value="Tulimshar Suburbs"/>
@@ -19,7 +19,7 @@
  <tileset firstgid="1377" source="../tilesets/water.tsx"/>
  <tileset firstgid="1542" source="../tilesets/water_overflow.tsx"/>
  <tileset firstgid="1614" source="../tilesets/desert_city_x2.tsx"/>
- <layer name="Ground1" width="160" height="141">
+ <layer id="1" name="Ground1" width="160" height="141">
   <data encoding="csv">
 1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1540,1522,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,61,3,46,3,3,3,3,3,165,166,150,150,134,135,135,135,136,152,152,153,154,11,3,3,3,118,3,3,3,45,3,3,3,3,3,120,3,3,3,3,3,3,3,1524,1540,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,
 1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1540,1522,3,134,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,118,3,3,3,3,3,3,3,3,3,3,9,11,3,166,150,150,151,151,151,152,152,168,169,170,9,11,3,3,134,118,3,3,3,3,3,45,3,120,136,3,3,3,3,3,3,3,1524,1540,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,
@@ -164,7 +164,7 @@
 1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1540,1522,3,3,3,358,359,360,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,152,152,168,3,3,693,694,693,694,694,3,3,419,423,404,422,420,420,420,420,420,420,420,420,420,420,420,420,420,423,404,405,501,3,677,678,680,678,3,3,3,213,217,3,3,3,3,3,3,3,3,3,3,403,404,405,3,3,606,606,605,605,606
 </data>
  </layer>
- <layer name="Ground2" width="160" height="141">
+ <layer id="2" name="Ground2" width="160" height="141">
   <data encoding="csv">
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1519,1514,914,117,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,102,0,0,0,0,0,0,0,0,0,106,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,117,0,0,0,0,0,0,0,0,0,0,0,122,0,0,0,0,0,0,916,1512,1517,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1519,1514,914,133,0,114,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,117,0,0,0,0,0,0,0,0,0,105,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,133,0,0,0,0,0,0,0,0,0,0,0,138,0,0,0,0,0,0,916,1512,1517,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -309,7 +309,7 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1519,1514,914,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,88,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,106,0,0,0,643,0,0,0,0,0,644,0,0,0,0,0,0,623,629,629,629,629,624,0,0,0,0,0,0,0,0,0,0,671,0,0,0,0,672,0,0,0,0,0,649,650,650,650,650,699,650,652,0,1197,0,1168,0,681,0,0,0,0,0
 </data>
  </layer>
- <layer name="Ground3" width="160" height="141">
+ <layer id="3" name="Ground3" width="160" height="141">
   <data encoding="csv">
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,114,186,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,114,186,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -454,7 +454,7 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 </data>
  </layer>
- <layer name="Ground4" width="160" height="141">
+ <layer id="4" name="Ground4" width="160" height="141">
   <data encoding="csv">
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -599,7 +599,7 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 </data>
  </layer>
- <layer name="Fringe" width="160" height="141">
+ <layer id="5" name="Fringe" width="160" height="141">
   <data encoding="csv">
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,550,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,595,596,597,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -702,7 +702,7 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,598,599,600,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,595,596,597,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,595,596,597,0,598,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,595,596,597,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,519,520,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,598,599,600,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,595,596,597,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -744,7 +744,7 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,681,0,0,0,0,0
 </data>
  </layer>
- <layer name="Over1" width="160" height="141">
+ <layer id="6" name="Over1" width="160" height="141">
   <data encoding="csv">
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -889,7 +889,7 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 </data>
  </layer>
- <layer name="Over2" width="160" height="141">
+ <layer id="7" name="Over2" width="160" height="141">
   <data encoding="csv">
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -1034,7 +1034,7 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 </data>
  </layer>
- <layer name="Collision" width="160" height="141">
+ <layer id="8" name="Collision" width="160" height="141" visible="0">
   <data encoding="csv">
 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
@@ -1179,8 +1179,8 @@
 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2
 </data>
  </layer>
- <objectgroup name="Objects">
-  <object id="1" name="Maggot" type="spawn" x="2752" y="1984" width="1026" height="534">
+ <objectgroup id="9" name="Objects" visible="0">
+  <object id="1" name="Maggot" class="spawn" x="2752" y="1984" width="1026" height="534">
    <properties>
     <property name="eA_death" value="30000"/>
     <property name="eA_spawn" value="100000"/>
@@ -1188,7 +1188,7 @@
     <property name="monster_id" value="0"/>
    </properties>
   </object>
-  <object id="2" name="Maggot" type="spawn" x="1672" y="1692" width="917" height="524">
+  <object id="2" name="Maggot" class="spawn" x="1672" y="1692" width="917" height="524">
    <properties>
     <property name="eA_death" value="30000"/>
     <property name="eA_spawn" value="100000"/>
@@ -1196,7 +1196,7 @@
     <property name="monster_id" value="0"/>
    </properties>
   </object>
-  <object id="3" name="BlackScorpion" type="spawn" x="2080" y="3136" width="256" height="288">
+  <object id="3" name="BlackScorpion" class="spawn" x="2080" y="3136" width="256" height="288">
    <properties>
     <property name="eA_death" value="30000"/>
     <property name="eA_spawn" value="100000"/>
@@ -1204,7 +1204,7 @@
     <property name="monster_id" value="7"/>
    </properties>
   </object>
-  <object id="4" name="Scorpion" type="spawn" x="3072" y="2688" width="192" height="288">
+  <object id="4" name="Scorpion" class="spawn" x="3072" y="2688" width="192" height="288">
    <properties>
     <property name="eA_death" value="30000"/>
     <property name="eA_spawn" value="100000"/>
@@ -1212,7 +1212,7 @@
     <property name="monster_id" value="1"/>
    </properties>
   </object>
-  <object id="5" name="TameScorpion" type="spawn" x="1440" y="1536" width="1216" height="992">
+  <object id="5" name="TameScorpion" class="spawn" x="1440" y="1536" width="1216" height="992">
    <properties>
     <property name="eA_death" value="30000"/>
     <property name="eA_spawn" value="100000"/>
@@ -1220,7 +1220,7 @@
     <property name="monster_id" value="44"/>
    </properties>
   </object>
-  <object id="6" name="Scorpion" type="spawn" x="2656" y="3136" width="192" height="288">
+  <object id="6" name="Scorpion" class="spawn" x="2656" y="3136" width="192" height="288">
    <properties>
     <property name="eA_death" value="30000"/>
     <property name="eA_spawn" value="100000"/>
@@ -1228,7 +1228,7 @@
     <property name="monster_id" value="1"/>
    </properties>
   </object>
-  <object id="7" name="Scorpion" type="spawn" x="3072" y="3104" width="192" height="192">
+  <object id="7" name="Scorpion" class="spawn" x="3072" y="3104" width="192" height="192">
    <properties>
     <property name="eA_death" value="30000"/>
     <property name="eA_spawn" value="100000"/>
@@ -1236,7 +1236,7 @@
     <property name="monster_id" value="1"/>
    </properties>
   </object>
-  <object id="8" name="Scorpion" type="spawn" x="2528" y="2752" width="224" height="128">
+  <object id="8" name="Scorpion" class="spawn" x="2528" y="2752" width="224" height="128">
    <properties>
     <property name="eA_death" value="30000"/>
     <property name="eA_spawn" value="100000"/>
@@ -1244,7 +1244,7 @@
     <property name="monster_id" value="1"/>
    </properties>
   </object>
-  <object id="9" name="BlackScorpion" type="spawn" x="2176" y="2688" width="192" height="288">
+  <object id="9" name="BlackScorpion" class="spawn" x="2176" y="2688" width="192" height="288">
    <properties>
     <property name="eA_death" value="30000"/>
     <property name="eA_spawn" value="100000"/>
@@ -1252,7 +1252,7 @@
     <property name="monster_id" value="7"/>
    </properties>
   </object>
-  <object id="10" name="BlackScorpion" type="spawn" x="2400" y="1056" width="384" height="192">
+  <object id="10" name="BlackScorpion" class="spawn" x="2400" y="1056" width="384" height="192">
    <properties>
     <property name="eA_death" value="30000"/>
     <property name="eA_spawn" value="100000"/>
@@ -1260,20 +1260,20 @@
     <property name="monster_id" value="7"/>
    </properties>
   </object>
-  <object id="12" name="To Lighthouse Beach" type="warp" x="2048" y="640" width="64" height="32">
+  <object id="12" name="To Lighthouse Beach" class="warp" x="2048" y="640" width="64" height="32">
    <properties>
     <property name="dest_map" value="023-1"/>
     <property name="dest_tile_x" value="64"/>
     <property name="dest_tile_y" value="143"/>
    </properties>
   </object>
-  <object id="22" name="To Tulismhar Outskirts" type="warp" x="1376" y="3680" width="96" height="32">
+  <object id="22" name="To Tulismhar Outskirts" class="warp" x="1376" y="3680" width="96" height="32">
    <properties>
     <property name="dest_map" value="041-1"/>
     <property name="dest_tile_x" value="58"/>
     <property name="dest_tile_y" value="6"/>
    </properties>
   </object>
-  <object id="23" name="graphics/particles/warparea.particle.xml" type="particle_effect" x="2016" y="1472" width="32" height="32"/>
+  <object id="23" name="graphics/particles/warparea.particle.xml" class="particle_effect" x="2016" y="1472" width="32" height="32"/>
  </objectgroup>
 </map>
diff --git a/maps/047-1.tmx b/maps/047-1.tmx
index 3ad084be..97f84aa3 100644
--- a/maps/047-1.tmx
+++ b/maps/047-1.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.0" orientation="orthogonal" renderorder="right-down" width="225" height="200" tilewidth="32" tileheight="32" nextobjectid="37">
+<map version="1.9" tiledversion="1.9.2" orientation="orthogonal" renderorder="right-down" width="225" height="200" tilewidth="32" tileheight="32" infinite="0" nextlayerid="9" nextobjectid="37">
  <properties>
   <property name="music" value="explorers-melody.ogg"/>
   <property name="name" value="snow Hills"/>
@@ -13,7 +13,7 @@
  <tileset firstgid="612" source="../tilesets/snow_docks.tsx"/>
  <tileset firstgid="772" source="../tilesets/snow_village.tsx"/>
  <tileset firstgid="1028" source="../tilesets/snow_village_x4.tsx"/>
- <layer name="Ground1" width="225" height="200">
+ <layer id="1" name="Ground1" width="225" height="200">
   <data encoding="csv">
 86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,148,148,148,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,148,86,148,148,148,148,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,70,70,86,86,70,70,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,
 86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,148,148,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,148,86,86,148,148,148,595,595,595,595,595,595,595,595,595,595,595,595,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,70,86,86,70,70,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,
@@ -217,7 +217,7 @@
 86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86
 </data>
  </layer>
- <layer name="Ground2" width="225" height="200">
+ <layer id="2" name="Ground2" width="225" height="200">
   <data encoding="csv">
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,147,0,0,147,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,150,132,133,0,0,0,131,132,133,0,149,0,0,0,0,0,0,0,147,0,0,0,0,195,196,196,196,196,197,0,0,131,132,132,151,0,0,0,0,0,0,0,0,0,0,150,133,0,0,0,0,0,0,0,149,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,195,196,179,163,164,164,164,164,164,164,164,164,164,164,164,165,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,147,0,0,147,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,150,132,132,132,151,0,149,0,149,0,0,0,0,0,0,0,147,0,0,0,0,0,0,0,0,0,0,131,132,151,0,0,0,0,0,0,0,0,0,0,0,0,0,0,149,0,0,0,0,0,0,134,165,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,195,196,196,196,196,196,196,196,196,196,196,196,196,197,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -421,7 +421,7 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,195,179,180,180,180,163,164,164,164,135,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,134,165,197,0,0,0,0,0,0,0,0,0,0,0,147,148,148,148,148,148,148,148,148,148,149,0,0,0,0,0,0,0,0,0,147,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,147,195,196,196,196,196,179,180,180,180,181,196,196,196,196,196,196,196,197,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 </data>
  </layer>
- <layer name="Fringe" width="225" height="200" visible="0">
+ <layer id="3" name="Fringe" width="225" height="200">
   <data encoding="csv">
 0,0,0,0,275,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,275,0,0,0,0,0,0,0,0,0,0,0,275,0,0,0,0,0,275,0,0,0,0,0,0,0,0,277,0,0,275,0,276,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,276,0,0,0,0,0,0,0,0,277,0,0,0,0,276,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,275,0,0,0,0,0,0,0,0,275,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -600,8 +600,8 @@
 0,0,275,0,0,0,275,0,0,275,0,0,275,0,0,0,0,0,0,275,0,0,0,0,0,0,276,0,0,277,0,0,0,0,275,0,0,0,0,275,0,0,0,0,0,0,0,0,0,0,0,0,0,0,275,0,275,0,276,0,0,0,0,275,0,276,0,0,0,0,0,0,0,0,0,265,0,0,0,276,0,275,0,276,0,276,0,0,0,0,0,0,275,0,0,0,0,0,0,0,0,0,0,275,0,0,276,0,275,0,0,0,0,0,0,0,0,276,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,275,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,276,0,0,0,0,0,0,0,0,276,0,0,0,0,276,0,276,0,0,0,276,0,276,0,0,0,275,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,275,0,275,0,0,0,275,0,0,275,0,0,0,0,275,0,0,0,0,0,0,0,0,0,0,0,0,277,0,0,276,0,0,275,0,0,0,275,0,0,276,0,0,0,275,0,0,0,0,0,0,0,0,277,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,276,0,0,276,0,0,0,0,0,276,0,276,0,0,0,0,275,0,0,0,0,0,0,276,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,275,0,0,0,276,0,275,0,276,0,0,277,0,0,275,0,0,0,0,262,0,267,0,275,0,0,0,0,0,276,275,275,0,0,0,276,0,0,0,0,0,0,0,276,0,0,0,276,0,0,276,0,276,0,0,276,0,0,276,0,0,0,0,0,3,0,0,0,276,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,275,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,275,0,0,0,0,0,0,275,0,276,0,0,0,0,0,0,0,276,0,0,0,275,0,276,0,0,275,0,275,0,0,0,0,0,0,0,0,0,0,0,0,278,0,0,0,0,0,0,275,0,276,0,275,0,0,0,276,0,0,0,0,0,0,276,0,0,0,0,0,0,0,0,0,0,263,0,0,0,0,0,0,276,0,276,0,0,275,0,275,0,0,0,0,0,275,0,0,0,275,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,263,264,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-275,0,0,0,0,276,275,0,276,0,0,0,0,0,276,0,276,0,276,0,0,276,0,0,0,0,275,0,276,0,0,275,0,275,0,0,4,0,0,0,0,0,0,0,0,0,0,0,276,0,0,0,275,0,276,0,275,0,0,0,278,275,0,276,0,0,0,275,0,0,0,0,0,0,0,0,0,0,0,275,0,0,275,0,0,0,0,275,0,275,0,0,0,275,0,0,0,0,275,0,276,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,276,0,0,0,0,0,0,0,0,0,0,0,4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,275,0,0,0,0,0,0,275,0,276,0,0,0,0,0,0,0,276,0,0,0,275,0,276,0,0,275,0,275,0,0,0,0,0,0,0,0,0,0,0,0,278,0,0,0,0,0,0,275,0,276,0,275,0,0,0,276,0,0,0,0,0,0,276,0,0,0,0,0,0,0,0,0,0,263,0,0,0,0,0,0,276,0,276,0,0,275,0,275,0,0,0,0,0,275,0,0,0,275,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+275,0,0,0,0,276,275,0,276,0,0,0,0,0,276,0,276,0,276,0,0,276,0,0,0,0,275,0,276,0,0,275,0,275,0,0,4,0,0,0,0,0,0,0,0,0,0,0,276,0,0,0,275,0,276,0,275,0,0,0,278,275,0,276,0,0,0,275,0,0,0,0,0,0,0,0,0,0,0,275,0,0,275,0,0,0,0,275,0,275,0,0,0,275,0,0,0,0,275,0,276,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,276,0,0,0,0,0,0,0,0,0,0,0,4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,263,264,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,276,0,0,0,0,0,0,276,0,0,276,0,0,0,0,0,0,275,0,275,0,0,0,0,0,0,0,275,0,0,275,0,275,0,0,0,0,0,0,0,0,0,0,0,276,0,275,0,276,0,0,0,0,0,0,0,275,0,276,0,0,0,277,0,0,0,0,0,0,0,0,0,0,0,275,0,0,0,0,276,0,275,0,275,0,0,0,0,0,275,0,0,276,0,0,0,0,0,0,0,275,0,276,0,0,0,0,0,0,0,0,275,0,0,276,275,0,276,0,276,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,263,264,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,276,0,276,0,0,275,0,0,275,0,0,0,0,0,275,0,0,275,0,0,0,0,276,0,276,0,276,0,0,276,0,0,0,0,0,276,0,0,275,0,0,0,0,276,0,275,0,263,264,0,0,275,0,0,276,0,276,0,0,0,0,276,0,0,0,275,0,0,0,0,268,0,263,264,277,0,0,0,0,0,0,0,0,0,0,278,276,0,276,0,0,0,275,0,0,276,0,275,0,275,0,276,0,0,0,4,0,0,0,0,0,0,0,276,0,275,0,275,0,0,275,0,276,0,275,0,276,0,0,0,0,0,0,263,264,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,278,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,275,0,0,275,0,0,0,276,0,0,276,0,0,276,0,0,276,0,275,0,0,0,0,0,0,0,275,0,275,0,276,0,275,0,276,0,0,276,0,275,0,0,0,0,0,275,0,0,278,0,0,275,0,0,275,0,276,0,0,0,276,0,0,0,0,266,0,0,0,276,0,267,0,0,275,0,263,264,0,276,0,275,0,0,0,0,0,276,0,0,0,275,0,0,0,276,278,0,0,275,0,0,0,0,0,0,0,0,0,0,275,0,0,276,0,0,263,264,0,0,0,0,0,275,0,276,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,263,264,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -625,7 +625,7 @@
 275,0,276,0,0,276,0,276,0,0,0,276,0,0,276,0,0,0,275,0,0,0,276,0,0,276,0,275,275,0,0,0,276,0,0,0,275,0,0,275,0,0,0,275,0,276,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,278,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,275,0,0,0,0,0,0,0,263,264,0,0,0,0,0,0,0,0,0,0,275,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,275,0,0,0,0,0,0,0,0,0,276,0,0,0,0,0,0
 </data>
  </layer>
- <layer name="Over1" width="225" height="200" visible="0">
+ <layer id="4" name="Over1" width="225" height="200">
   <data encoding="csv">
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -829,7 +829,7 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 </data>
  </layer>
- <layer name="Over2" width="225" height="200" visible="0">
+ <layer id="5" name="Over2" width="225" height="200">
   <data encoding="csv">
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -1033,7 +1033,7 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 </data>
  </layer>
- <layer name="Over3" width="225" height="200" visible="0">
+ <layer id="6" name="Over3" width="225" height="200">
   <data encoding="csv">
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -1237,7 +1237,7 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 </data>
  </layer>
- <layer name="Collision" width="225" height="200">
+ <layer id="7" name="Collision" width="225" height="200" visible="0">
   <data encoding="csv">
 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
@@ -1407,7 +1407,7 @@
 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,0,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,0,2,2,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,0,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,0,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,0,2,2,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,0,0,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,0,0,0,0,0,0,0,0,0,2,2,0,0,2,2,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
-2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,0,0,0,0,2,2,2,2,2,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,0,0,2,2,0,0,0,0,0,0,2,2,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,0,0,2,2,2,2,2,2,2,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,0,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
+2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,0,0,0,0,2,2,2,2,2,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,0,0,2,2,0,0,0,0,0,0,2,2,0,0,0,0,2,2,0,2,2,2,2,2,2,2,2,2,2,2,0,0,2,2,2,2,2,2,2,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,0,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,0,0,0,2,2,2,2,2,2,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,0,2,0,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,0,0,0,0,0,2,2,2,2,2,2,2,2,2,0,0,2,2,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,0,0,2,2,2,2,2,2,2,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,0,0,0,2,2,0,2,2,2,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,0,0,2,2,2,2,2,2,2,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,0,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,0,0,0,0,2,2,2,2,2,2,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
@@ -1415,7 +1415,7 @@
 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,0,0,0,2,2,0,2,2,2,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,0,0,0,2,2,2,2,0,2,2,2,2,2,2,2,2,2,2,2,2,0,0,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,0,0,0,0,0,0,0,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,0,0,2,2,0,0,0,2,2,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,0,0,0,0,0,2,2,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,0,0,0,0,0,0,0,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,0,0,2,2,0,2,2,0,0,2,2,0,0,0,0,0,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
-2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,2,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,0,0,0,0,0,2,2,0,0,2,2,0,2,2,2,2,2,2,2,0,2,2,0,0,0,0,2,0,0,0,2,2,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,0,2,2,2,2,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
+2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,2,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,0,0,0,0,0,2,2,0,0,2,2,0,2,2,2,2,2,2,2,0,2,2,0,0,0,0,2,0,0,0,2,2,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,2,2,2,2,2,2,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,2,2,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,2,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,0,2,2,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,0,0,0,0,0,0,0,2,2,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,0,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,0,0,2,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,0,0,2,2,0,2,2,2,2,2,2,2,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
@@ -1441,78 +1441,78 @@
 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2
 </data>
  </layer>
- <objectgroup name="Objects" visible="0">
-  <object id="1" name="To Small Cave" type="warp" x="3456" y="5280" width="32" height="32">
+ <objectgroup id="8" name="Objects" visible="0">
+  <object id="1" name="To Small Cave" class="warp" x="3456" y="5280" width="32" height="32">
    <properties>
     <property name="dest_map" value="047-3"/>
     <property name="dest_tile_x" value="110"/>
     <property name="dest_tile_y" value="102"/>
    </properties>
   </object>
-  <object id="2" name="To Small Cave" type="warp" x="3456" y="4992" width="32" height="32">
+  <object id="2" name="To Small Cave" class="warp" x="3456" y="4992" width="32" height="32">
    <properties>
     <property name="dest_map" value="047-3"/>
     <property name="dest_tile_x" value="119"/>
     <property name="dest_tile_y" value="94"/>
    </properties>
   </object>
-  <object id="3" name="To Small Cave" type="warp" x="3264" y="3552" width="32" height="32">
+  <object id="3" name="To Small Cave" class="warp" x="3264" y="3552" width="32" height="32">
    <properties>
     <property name="dest_map" value="047-3"/>
     <property name="dest_tile_x" value="119"/>
     <property name="dest_tile_y" value="58"/>
    </properties>
   </object>
-  <object id="4" name="To Small Cave" type="warp" x="3264" y="3424" width="32" height="32">
+  <object id="4" name="To Small Cave" class="warp" x="3264" y="3424" width="32" height="32">
    <properties>
     <property name="dest_map" value="047-3"/>
     <property name="dest_tile_x" value="128"/>
     <property name="dest_tile_y" value="45"/>
    </properties>
   </object>
-  <object id="5" name="To Deeper Snow Cave" type="warp" x="4928" y="2944" width="32" height="32">
+  <object id="5" name="To Deeper Snow Cave" class="warp" x="4928" y="2944" width="32" height="32">
    <properties>
     <property name="dest_map" value="019-4"/>
     <property name="dest_tile_x" value="74"/>
     <property name="dest_tile_y" value="27"/>
    </properties>
   </object>
-  <object id="6" name="To Snow Hills Cave" type="warp" x="3232" y="4576" width="32" height="32">
+  <object id="6" name="To Snow Hills Cave" class="warp" x="3232" y="4576" width="32" height="32">
    <properties>
     <property name="dest_map" value="047-3"/>
     <property name="dest_tile_x" value="126"/>
     <property name="dest_tile_y" value="180"/>
    </properties>
   </object>
-  <object id="7" name="To Snow Hills Cave" type="warp" x="1184" y="5536" width="32" height="32">
+  <object id="7" name="To Snow Hills Cave" class="warp" x="1184" y="5536" width="32" height="32">
    <properties>
     <property name="dest_map" value="047-3"/>
     <property name="dest_tile_x" value="33"/>
     <property name="dest_tile_y" value="175"/>
    </properties>
   </object>
-  <object id="8" name="To Snow Hills Cave" type="warp" x="1440" y="2336" width="32" height="32">
+  <object id="8" name="To Snow Hills Cave" class="warp" x="1440" y="2336" width="32" height="32">
    <properties>
     <property name="dest_map" value="047-3"/>
     <property name="dest_tile_x" value="46"/>
     <property name="dest_tile_y" value="76"/>
    </properties>
   </object>
-  <object id="9" name="To Snow Hills Cave" type="warp" x="2496" y="3488" width="32" height="32">
+  <object id="9" name="To Snow Hills Cave" class="warp" x="2496" y="3488" width="32" height="32">
    <properties>
     <property name="dest_map" value="047-3"/>
     <property name="dest_tile_x" value="35"/>
     <property name="dest_tile_y" value="41"/>
    </properties>
   </object>
-  <object id="10" name="To Snow Hills Cave" type="warp" x="2656" y="3936" width="32" height="32">
+  <object id="10" name="To Snow Hills Cave" class="warp" x="2656" y="3936" width="32" height="32">
    <properties>
     <property name="dest_map" value="047-3"/>
     <property name="dest_tile_x" value="108"/>
     <property name="dest_tile_y" value="165"/>
    </properties>
   </object>
-  <object id="11" name="WhiteSlime" type="spawn" x="1152" y="5568" width="128" height="96">
+  <object id="11" name="WhiteSlime" class="spawn" x="1152" y="5568" width="128" height="96">
    <properties>
     <property name="eA_death" value="30000"/>
     <property name="eA_spawn" value="100000"/>
@@ -1520,7 +1520,7 @@
     <property name="monster_id" value="91"/>
    </properties>
   </object>
-  <object id="12" name="BlueSlime" type="spawn" x="1408" y="2368" width="96" height="96">
+  <object id="12" name="BlueSlime" class="spawn" x="1408" y="2368" width="96" height="96">
    <properties>
     <property name="eA_death" value="30000"/>
     <property name="eA_spawn" value="100000"/>
@@ -1528,7 +1528,7 @@
     <property name="monster_id" value="89"/>
    </properties>
   </object>
-  <object id="13" name="Reinboo" type="spawn" x="0" y="0">
+  <object id="13" name="Reinboo" class="spawn" x="0" y="0">
    <properties>
     <property name="eA_death" value="30000"/>
     <property name="eA_spawn" value="100000"/>
@@ -1536,7 +1536,7 @@
     <property name="monster_id" value="92"/>
    </properties>
   </object>
-  <object id="14" name="Fluffy" type="spawn" x="0" y="0">
+  <object id="14" name="Fluffy" class="spawn" x="0" y="0">
    <properties>
     <property name="eA_death" value="30000"/>
     <property name="eA_spawn" value="100000"/>
@@ -1544,7 +1544,7 @@
     <property name="monster_id" value="18"/>
    </properties>
   </object>
-  <object id="15" name="Squirrel" type="spawn" x="0" y="0">
+  <object id="15" name="Squirrel" class="spawn" x="0" y="0">
    <properties>
     <property name="eA_death" value="30000"/>
     <property name="eA_spawn" value="100000"/>
@@ -1552,7 +1552,7 @@
     <property name="monster_id" value="36"/>
    </properties>
   </object>
-  <object id="16" name="Moggun" type="spawn" x="960" y="3104" width="3328" height="1824">
+  <object id="16" name="Moggun" class="spawn" x="960" y="3104" width="3328" height="1824">
    <properties>
     <property name="eA_death" value="30000"/>
     <property name="eA_spawn" value="100000"/>
@@ -1560,7 +1560,7 @@
     <property name="monster_id" value="59"/>
    </properties>
   </object>
-  <object id="17" name="Wolvern" type="spawn" x="5664" y="3360" width="832" height="1184">
+  <object id="17" name="Wolvern" class="spawn" x="5664" y="3360" width="832" height="1184">
    <properties>
     <property name="eA_death" value="30000"/>
     <property name="eA_spawn" value="100000"/>
@@ -1568,7 +1568,7 @@
     <property name="monster_id" value="88"/>
    </properties>
   </object>
-  <object id="18" name="Wolvern" type="spawn" x="4736" y="3360" width="832" height="672">
+  <object id="18" name="Wolvern" class="spawn" x="4736" y="3360" width="832" height="672">
    <properties>
     <property name="eA_death" value="30000"/>
     <property name="eA_spawn" value="100000"/>
@@ -1576,7 +1576,7 @@
     <property name="monster_id" value="88"/>
    </properties>
   </object>
-  <object id="19" name="Wolvern" type="spawn" x="4640" y="4736" width="1568" height="1024">
+  <object id="19" name="Wolvern" class="spawn" x="4640" y="4736" width="1568" height="1024">
    <properties>
     <property name="eA_death" value="30000"/>
     <property name="eA_spawn" value="100000"/>
@@ -1584,7 +1584,7 @@
     <property name="monster_id" value="88"/>
    </properties>
   </object>
-  <object id="20" name="Wolvern" type="spawn" x="1088" y="1792" width="1568" height="1024">
+  <object id="20" name="Wolvern" class="spawn" x="1088" y="1792" width="1568" height="1024">
    <properties>
     <property name="eA_death" value="30000"/>
     <property name="eA_spawn" value="100000"/>
@@ -1592,7 +1592,7 @@
     <property name="monster_id" value="88"/>
    </properties>
   </object>
-  <object id="21" name="Wolvern" type="spawn" x="3584" y="3328" width="672" height="800">
+  <object id="21" name="Wolvern" class="spawn" x="3584" y="3328" width="672" height="800">
    <properties>
     <property name="eA_death" value="30000"/>
     <property name="eA_spawn" value="100000"/>
@@ -1600,7 +1600,7 @@
     <property name="monster_id" value="88"/>
    </properties>
   </object>
-  <object id="22" name="Wolvern" type="spawn" x="3136" y="5216" width="832" height="672">
+  <object id="22" name="Wolvern" class="spawn" x="3136" y="5216" width="832" height="672">
    <properties>
     <property name="eA_death" value="30000"/>
     <property name="eA_spawn" value="100000"/>
@@ -1608,7 +1608,7 @@
     <property name="monster_id" value="88"/>
    </properties>
   </object>
-  <object id="23" name="WhiteSlime" type="spawn" x="3424" y="5344" width="128" height="96">
+  <object id="23" name="WhiteSlime" class="spawn" x="3424" y="5344" width="128" height="96">
    <properties>
     <property name="eA_death" value="30000"/>
     <property name="eA_spawn" value="100000"/>
@@ -1616,7 +1616,7 @@
     <property name="monster_id" value="91"/>
    </properties>
   </object>
-  <object id="24" name="BlueSlime" type="spawn" x="3424" y="5024" width="128" height="96">
+  <object id="24" name="BlueSlime" class="spawn" x="3424" y="5024" width="128" height="96">
    <properties>
     <property name="eA_death" value="30000"/>
     <property name="eA_spawn" value="100000"/>
@@ -1624,7 +1624,7 @@
     <property name="monster_id" value="89"/>
    </properties>
   </object>
-  <object id="25" name="WhiteBell" type="spawn" x="0" y="0">
+  <object id="25" name="WhiteBell" class="spawn" x="0" y="0">
    <properties>
     <property name="eA_death" value="30000"/>
     <property name="eA_spawn" value="100000"/>
@@ -1632,14 +1632,14 @@
     <property name="monster_id" value="93"/>
    </properties>
   </object>
-  <object id="26" name="To Rock Plateau" type="warp" x="2240" y="5728" width="96" height="32">
+  <object id="26" name="To Rock Plateau" class="warp" x="2240" y="5728" width="96" height="32">
    <properties>
     <property name="dest_map" value="046-1"/>
     <property name="dest_tile_x" value="29"/>
     <property name="dest_tile_y" value="21"/>
    </properties>
   </object>
-  <object id="27" name="Yeti" type="spawn" x="2208" y="3264" width="1184" height="1152">
+  <object id="27" name="Yeti" class="spawn" x="2208" y="3264" width="1184" height="1152">
    <properties>
     <property name="eA_death" value="30000"/>
     <property name="eA_spawn" value="100000"/>
@@ -1647,21 +1647,21 @@
     <property name="monster_id" value="70"/>
    </properties>
   </object>
-  <object id="28" name="To Blue Sage Mansion" type="warp" x="4160" y="1600" width="32" height="32">
+  <object id="28" name="To Blue Sage Mansion" class="warp" x="4160" y="1600" width="32" height="32">
    <properties>
     <property name="dest_map" value="047-1"/>
     <property name="dest_tile_x" value="130"/>
     <property name="dest_tile_y" value="47"/>
    </properties>
   </object>
-  <object id="29" name="To Snow Hills" type="warp" x="4160" y="1536" width="32" height="32">
+  <object id="29" name="To Snow Hills" class="warp" x="4160" y="1536" width="32" height="32">
    <properties>
     <property name="dest_map" value="047-1"/>
     <property name="dest_tile_x" value="130"/>
     <property name="dest_tile_y" value="51"/>
    </properties>
   </object>
-  <object id="30" name="WhiteSlime" type="spawn" x="4384" y="672" width="96" height="96">
+  <object id="30" name="WhiteSlime" class="spawn" x="4384" y="672" width="96" height="96">
    <properties>
     <property name="eA_death" value="30000"/>
     <property name="eA_spawn" value="100000"/>
@@ -1669,7 +1669,7 @@
     <property name="monster_id" value="91"/>
    </properties>
   </object>
-  <object id="31" name="WhiteSlime" type="spawn" x="4992" y="2080" width="96" height="96">
+  <object id="31" name="WhiteSlime" class="spawn" x="4992" y="2080" width="96" height="96">
    <properties>
     <property name="eA_death" value="30000"/>
     <property name="eA_spawn" value="100000"/>
@@ -1677,7 +1677,7 @@
     <property name="monster_id" value="91"/>
    </properties>
   </object>
-  <object id="32" name="BlueSlime" type="spawn" x="5504" y="1408" width="160" height="192">
+  <object id="32" name="BlueSlime" class="spawn" x="5504" y="1408" width="160" height="192">
    <properties>
     <property name="eA_death" value="30000"/>
     <property name="eA_spawn" value="100000"/>
@@ -1685,7 +1685,7 @@
     <property name="monster_id" value="89"/>
    </properties>
   </object>
-  <object id="33" name="BlueSlime" type="spawn" x="4512" y="1312" width="160" height="192">
+  <object id="33" name="BlueSlime" class="spawn" x="4512" y="1312" width="160" height="192">
    <properties>
     <property name="eA_death" value="30000"/>
     <property name="eA_spawn" value="100000"/>
@@ -1693,7 +1693,7 @@
     <property name="monster_id" value="89"/>
    </properties>
   </object>
-  <object id="34" name="WhiteSlime" type="spawn" x="3872" y="1920" width="96" height="96">
+  <object id="34" name="WhiteSlime" class="spawn" x="3872" y="1920" width="96" height="96">
    <properties>
     <property name="eA_death" value="30000"/>
     <property name="eA_spawn" value="100000"/>
@@ -1701,7 +1701,7 @@
     <property name="monster_id" value="91"/>
    </properties>
   </object>
-  <object id="35" name="BlueSlime" type="spawn" x="4160" y="2176" width="160" height="192">
+  <object id="35" name="BlueSlime" class="spawn" x="4160" y="2176" width="160" height="192">
    <properties>
     <property name="eA_death" value="30000"/>
     <property name="eA_spawn" value="100000"/>
@@ -1709,7 +1709,7 @@
     <property name="monster_id" value="89"/>
    </properties>
   </object>
-  <object id="36" name="To Blue Sage" type="warp" x="4096" y="1248" width="32" height="32">
+  <object id="36" name="To Blue Sage" class="warp" x="4096" y="1248" width="32" height="32">
    <properties>
     <property name="dest_map" value="048-2"/>
     <property name="dest_tile_x" value="40"/>
diff --git a/tilesets/woodland_village_x2_to_1x.tsx b/tilesets/woodland_village_x2_to_1x.tsx
new file mode 100644
index 00000000..bbdbbd20
--- /dev/null
+++ b/tilesets/woodland_village_x2_to_1x.tsx
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tileset version="1.9" tiledversion="1.9.2" name="woodland_village_x2_to_x1" tilewidth="32" tileheight="32" tilecount="32" columns="16">
+ <image source="../graphics/tiles/woodland_village_x2.png" width="512" height="64"/>
+</tileset>
diff --git a/tilesets/woodland_x3_to_1x.tsx b/tilesets/woodland_x3_to_1x.tsx
new file mode 100644
index 00000000..ed798eba
--- /dev/null
+++ b/tilesets/woodland_x3_to_1x.tsx
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tileset version="1.9" tiledversion="1.9.2" name="woodland_x3_to_x1" tilewidth="32" tileheight="32" tilecount="96" columns="16">
+ <image source="../graphics/tiles/woodland_x3.png" width="512" height="192"/>
+</tileset>
-- 
cgit v1.2.3-60-g2f50