diff --git a/AndorsTrail/res/xml/fields11.tmx b/AndorsTrail/res/xml/fields11.tmx
index d2adbdc25..922c73299 100644
--- a/AndorsTrail/res/xml/fields11.tmx
+++ b/AndorsTrail/res/xml/fields11.tmx
@@ -131,7 +131,7 @@
  </layer>
  <layer name="Objects" width="20" height="20">
   <data encoding="base64" compression="zlib">
-   eJxjYCAMqgQYGGqguB6I84C4V4AIjVj0I5vRA8XEmIXNDT0kmgEClLgBGyDHDbhAFYX60c2qp5J51DALPf4o0Y/LjDwC5hLjBmLSRBUBNxCTJvC5BZcb7vBA6E9AMSZBCE0oPJDNuMuDxSGCCLNAND7/ILvlNrJZQH2Mgqh8mJk9WMID5o5bPKj+QmfD7ACrh9rhxUZdbMiOiaMEsIsTo84IC/YWwC4+HNQBAIb2WHk=
+   eJxjYCAMqgQYGGqguB6I84C4V4AIjVj0I5vRA8XEmIXNDT0kmgEClLgBGyDHDfQAsPCilln1FJqFHn+U6MdlRh4Bc4lxAzFpooqAG4hJE/jcgssNd3gg9CegGJMghCYUHshm3OXB4hBBhFkgGp9/kN1yG9ksoD5GQVQ+zMweLOEBc8ctHlR/obNhdoDVQ+3wYqMuNmTHxFEC2MWJUWeEBXsLYBcfDuoA8KVX7A==
   </data>
  </layer>
  <layer name="Above" width="20" height="20">
diff --git a/AndorsTrail/res/xml/fields12.tmx b/AndorsTrail/res/xml/fields12.tmx
index 8bea33102..2e08ca524 100644
--- a/AndorsTrail/res/xml/fields12.tmx
+++ b/AndorsTrail/res/xml/fields12.tmx
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
-<map version="1.0" orientation="orthogonal" width="20" height="20" tilewidth="32" tileheight="32">
+<map version="1.0" orientation="orthogonal" width="19" height="20" tilewidth="32" tileheight="32">
  <properties>
   <property name="outside" value="1"/>
  </properties>
@@ -124,56 +124,56 @@
  <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
   <image source="../drawable/map_window_2.png"/>
  </tileset>
- <layer name="Ground" width="20" height="20">
+ <layer name="Ground" width="19" height="20">
   <data encoding="base64" compression="zlib">
-   eJw7ysbAcBSK71CIj1PBDGSzqG0etfx4nArmoZtDbhzgModU8wiZQ4p5xJhDyLzjbMS7CZ955JiBjNHdQa45o3gUD0cMANbKSIk=
+   eJw7ysbAcBSI71CIj1PBDJg51DSLUr8dR8LkmoVuxlEyzMJlBilmETKDWLOIMQOfWcfZiHcLLrPI0Y+MyXXDKB7FQxkDAK5JN9w=
   </data>
  </layer>
- <layer name="Objects" width="20" height="20">
+ <layer name="Objects" width="19" height="20">
   <data encoding="base64" compression="zlib">
-   eJytk80NwjAMhQsHTj3Ea7ECzJABUCQWgAUpXaITkAAp9ouNkqhPsqr8+Muz0wQ3DCHGNYaPcY/Rqss3P+nmftHDSjp15mm+AvPmO7nIyTo38iyOb+xXLec51rG28oOeLM7D8GXVlVnImYCzMB//+lNTW2LtSV/T6pqZF17fe54+rMXJ99HyTtBPHlt3nP1gj3hu+u5I+sN8665WsVzNX63EOWT7E/NKTai1fpI5nIV5eI7V4zyPLOHP6M9k/C/Ffua7qIXKPsyjMmb7j4dt4wUF+1e6
+   eJytk9ENgzAMRGk/+sUHXqsr0BkyQIXUBdoFCyzBBE1Kgy6HrSYRliyE5bs8mzB0TfPw6Xy+fJbG/acP8ezWrPEJ0VfqmGcAJlc5E3rEuBV4WR6uYEe5HlP73+cIDmaxPN4KjzVL9GGPkTwWgwE5cuYJPmfRGVg/AwPO9K3L6rPA2SX3nzksLuTgnaAuPE+ScqFW+yZJgC6XiyM5Q2yurabMwbHNLKkm9rOG92H9G7GO/QmXsY/RuBPcH312/LKffW6Vd+i/Xo7LD6UWUvk=
   </data>
  </layer>
- <layer name="Above" width="20" height="20">
+ <layer name="Above" width="19" height="20">
   <data encoding="base64" compression="zlib">
-   eJxjYAACQQYGRkGGUTAK6Ao+CAxfs0BmfKSSm5DdAzKTEvdRM5ywAXT3wfjoYUHL8CFFPbo+UsOHVPXU8vNgAQCZwhct
+   eJxjEGRgYATiUTAKqA0+CAwvc0D6P1LBLcjuAJlHrruoFS7YALq7sPmdVuFBinpkPaSGBynqqeHPwQAAiFoWLA==
   </data>
  </layer>
- <layer name="Walkable" width="20" height="20">
+ <layer name="Walkable" width="19" height="20">
   <data encoding="base64" compression="zlib">
-   eJxzFWBgcKUSBgFqmjUYzUMH1DKHXPMIAWqZQ4p5pABqmIHPLHIBpfpxuYta7qF2OJFrHjXTArFmYjOb2HyFyw589pPrXmqbRW33UQMDAKDDR7k=
+   eJxzFWBgcKUCBgFqmTOYzEIH1DCDHLMIAWqYQaxZpABK9eMyh1xAqX5s7qGGO8g1i5bxRIkfSU2PxOYVbObjs5ccd1LTHGq6ixoYAO8oQr4=
   </data>
  </layer>
- <objectgroup name="Mapevents" width="20" height="20">
+ <objectgroup name="Mapevents" width="19" height="20">
   <object name="west" type="mapchange" x="0" y="320" width="32" height="160">
    <properties>
     <property name="map" value="fields11"/>
     <property name="place" value="east"/>
    </properties>
   </object>
-  <object name="east" type="mapchange" x="608" y="0" width="32" height="256">
+  <object name="east" type="mapchange" x="576" y="0" width="32" height="256">
    <properties>
     <property name="map" value="waterway0"/>
     <property name="place" value="west"/>
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Spawn" width="20" height="20">
+ <objectgroup name="Spawn" width="19" height="20">
   <object name="frog_2" type="spawn" x="64" y="256" width="320" height="192">
    <properties>
     <property name="quantity" value="2"/>
    </properties>
   </object>
-  <object name="frog_3" type="spawn" x="128" y="128" width="320" height="192">
+  <object name="frog_3" type="spawn" x="96" y="128" width="320" height="192">
    <properties>
     <property name="quantity" value="1"/>
    </properties>
   </object>
-  <object name="frog_2" type="spawn" x="288" y="32" width="288" height="320">
+  <object name="frog_2" type="spawn" x="256" y="32" width="288" height="320">
    <properties>
     <property name="quantity" value="3"/>
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Keys" width="20" height="20"/>
+ <objectgroup name="Keys" width="19" height="20"/>
 </map>
diff --git a/AndorsTrail/res/xml/road1.tmx b/AndorsTrail/res/xml/road1.tmx
index 789a9b1dc..506accf35 100644
--- a/AndorsTrail/res/xml/road1.tmx
+++ b/AndorsTrail/res/xml/road1.tmx
@@ -172,12 +172,6 @@
   <object name="sign_foamingflask" type="sign" x="448" y="224" width="32" height="32"/>
   <object name="sign_road1_nw" type="sign" x="256" y="256" width="32" height="32"/>
   <object name="sign_road1_s" type="sign" x="448" y="480" width="32" height="32"/>
-  <object name="north" type="mapchange" x="64" y="0" width="256" height="32">
-   <properties>
-    <property name="map" value="roadbeforecrossroads9"/>
-    <property name="place" value="south"/>
-   </properties>
-  </object>
  </objectgroup>
  <objectgroup name="Spawn" width="25" height="25">
   <object name="ff_outsideguard" type="spawn" x="640" y="224" width="32" height="32">
diff --git a/AndorsTrail/res/xml/roadbeforecrossroads.tmx b/AndorsTrail/res/xml/roadbeforecrossroads.tmx
index b2493c3ca..63a2c7e3e 100644
--- a/AndorsTrail/res/xml/roadbeforecrossroads.tmx
+++ b/AndorsTrail/res/xml/roadbeforecrossroads.tmx
@@ -157,12 +157,6 @@
     <property name="place" value="southeast"/>
    </properties>
   </object>
-  <object name="east" type="mapchange" x="640" y="192" width="32" height="192">
-   <properties>
-    <property name="map" value="roadbeforecrossroads1"/>
-    <property name="place" value="west"/>
-   </properties>
-  </object>
  </objectgroup>
  <objectgroup name="Spawn" width="21" height="20">
   <object name="larva_1" type="spawn" x="224" y="448" width="32" height="32"/>
diff --git a/AndorsTrail/res/xml/waterway12.tmx b/AndorsTrail/res/xml/waterway12.tmx
index 68cf9d4d3..10ccbb80c 100644
--- a/AndorsTrail/res/xml/waterway12.tmx
+++ b/AndorsTrail/res/xml/waterway12.tmx
@@ -141,7 +141,7 @@
  </layer>
  <layer name="Walkable" width="30" height="30">
   <data encoding="base64" compression="zlib">
-   eJztk8ENwCAMAxmhS7H/Sv1WVaB2MKaPIPkVyBkc+tVaL5VKpc1Cl4uj8JLpkeUje1nPyvdy5sJwV/nR2ew8fvlA6sq/MNvzrJ34g1G/HdxZ/5GfEXsl3wxTNdfvOziyZrNFuOg8Rz4YLntvlpF566ju4Co5aMYOOVl/0Q3fNMnh
+   eJztk8ENwCAMAxmhS7H/Sv2iKoAdjNVHkPwK5AwO/Wmtl0ql0mWhy8VReMn0yPKRvaxn5Xs5c2G4p/zobHYedz6QuvIvrPaMtW9PR9ZRvxvcVf+Znxn7JN8MUzXXTLZKPpMtwkXnOfLBcNl7s4zMW0d1B1fJQTN2yMn6i17tGsmM
   </data>
  </layer>
  <objectgroup name="Mapevents" width="30" height="30">
diff --git a/AndorsTrail/res/xml/waterway6.tmx b/AndorsTrail/res/xml/waterway6.tmx
index ea4c4c850..b79501f28 100644
--- a/AndorsTrail/res/xml/waterway6.tmx
+++ b/AndorsTrail/res/xml/waterway6.tmx
@@ -126,25 +126,25 @@
  </tileset>
  <layer name="Ground" width="30" height="30" opacity="0.99">
   <data encoding="base64" compression="zlib">
-   eJzl1TEOgzAMBdCUoXN7HDp2hWujXoJTcAKaIZJlQWT/b5KB4a+8fDsi6zOl1ZCFyDik9FGxmDk/wp3+zqxidVmbcYvN+CVeV/syLVzpfx/YDFg7u+i9j3Kt6eVuL95G3OHNzxvtq22vj/aVs0Z89F4d9fXYqFtmXetd85n9nu3ZcoaI/XrshXD1d7y95f8Zfaese9Yu+zYie2YinVpfzxw88/WcL6pvdJfIvleYrfv2mvHd0nu/re/zDsDjywI=
+   eJzt1TEKgDAMBdDq4KzH0dFVry1ewlN4Au1QKEEl+T9UBIc/P/MT7NaEsCmyEOnrEAYRjRmzEu50OrOI1mVtxk0246dYXennKeHm/lhhHbB2dNG793K1ecvdW95G3Lrj+0bnlbbVR+fNu0Z89K6u5rXYqJu6fpr7yWf2e7dnzTd47NdiL4Qru7XOnf+fmXdKs2fper2N1q6RXPV6N6+lB89evXso0au261Km5+689/vnu/stfc8H9DnMOw==
   </data>
  </layer>
  <layer name="Objects" width="30" height="30">
   <data encoding="base64" compression="zlib">
-   eJy9VztOxDAQdbagCsIRJUtJSwOnIBIHIEhUtHABlh4ENUfiBFCwiRAcIVwAm3jYycvY6ySbfdJoHcee92bGn6xSYTxqpW6N3Rtb6KavTJvfb70al+1259Zp+/kn7Y4JoXD+iZv8leAHeVBbX1DMxH3HYrfgsRIP7zuaKfWSNO2HZDg35+e2EGLDnJAeaWyI+wn4OS6F/lpYC6S7D3eIn3xJa4xr+Eq7a3UIvwXpkPIvGdVNytFQHTFmUYyIeazOMfneFLdvT0zJjetjav4kU6pKm32O/JNwZ6vmB5wt28x9krU1SLnfRv5L4N90/f/izNp9S5b3irUxBxYxZxQ3y5UAXwcwhvQUQqyvO3GGa6kVP8Rpwe815L3peU5STD4sPdrwPH7WbZ2tOmno53ysbeOVcoE1uTD+rvf8mjl89+On0yHW25OPnMWxz/z+1yPCn32P3yVeH66dC2uLINWnCow/N+/OIu1Kg7YeGggUS872F65nfO5AyCt+W/E687GWF/X79IbiQI28/lwfcYVqhnMkoGapBqGaWeBeovh858m6Okh7SapnSPM6VOwcOTD/GQ5nEZNcLk+MvlOn8c34eY+8f2rdzLd8c2PHzubOfgG0bp26
+   eJy9VztSwzAQlVNQmUEaSkJJSwOnIAU9ZqCihQsQehioORIngALsycABUpgLIGHv+Gm9kj/57MxOFEV67+2uflEqbk9aqTvrD9bnuurL0+rzRzfjzG57bpn633/T9piYZTU+cRNeznA4D9c21Chm4r6H2J1hrMSDfUcTpV6Tqv2YjOdGfvS5EBvPCemRxsa4nxk/2qXQXwprgXQP4Y7xE5a0xlDDd9peq2P4nZEOKf+SU92kHI3V0cedZSvEvKrOVfK9Lu7QntgkN18fm+ZPjFJFWu1zzr8RbtM0P9nZss3cJ8bXIOV+G/nPGf+66/8fp/H7viDvBbR5Dpz1OaPQiXMZu5NNk3/Ukwmxvu30c4e3IE7AJp6C6cF7jfPeDjgnz8DPtWrlGuPjxs/jF+3r9Oqk5X5nM/jNxcv3FfWjXdg5N3uyLm7S/ejwZnW8HLuaJGOh1n3AzaF2XXgOg79LghgGtAZMqk8hjL9i9e7j15ppG6CBzMuHac5sT2/XG1jIK39bYZ1p7DLwNg7pjcXBNWL9UV8rV5E1IfYrGSdUg0VEM99LFF/oPOmqQ2gvheZ1rRvJCjhHDux/hsNJj0l1Lk+svtNa47vF+eh5/5S6mu/4ptaPa5/W/gc9zp/G
   </data>
  </layer>
  <layer name="Above" width="30" height="30">
   <data encoding="base64" compression="zlib">
-   eJzNlksOgjAQhsG1CzidN4CTys4NN9ClK+EEdhIbazMNnWf9E9JHaL/5h6Fp19lqHYwBzhyKYkyesQHr8eHdG+Qk5Vsy8j4wNfM8I3ulvkp9qS7EvV7h/U2BT+WC+rENt5VfDTaXK5XEr6TGOPWsIWmevfzWsGvyPwm4ac41/i0q00K3yhxic1pn6hEnZ3JUipX6TeM7XO95vr1V8sv1g637xzsmRRZ17aUYO8fD0VpO7WJ7XcN4Sf6jPTyn8dty67IUez6HMaGFe9o64GfM8/w7fgOLGVmx
+   eJzNlj0OgzAMhaEzA5yuN6AnLRsLN2jHTqUnIJaKcCNbTWzH4UkoPyL5bOslStOU1dIXBjhzcrTH5BkbsJ5f3qNCTTC/JCPuA9OyzjdiL5wX19fqmrnXO/y/GvBzuaB2qMOtla8FW8rVSpOvxmMSP1tIW2evfFPYKfUfFVxcc4uzdQbNiTWk5qzuVIrD+Vvqe6tYcXyS/eJ6e/uI87A0H2rdGd+YlLicS/jaS3vskhz+rY29m7Mn1j2MJ3SOPuG7DEcr9SUXezxHMaGFd9rS03fMq/sdb1y+WrI=
   </data>
  </layer>
  <layer name="Walkable" width="30" height="30" visible="0">
   <data encoding="base64" compression="zlib">
-   eJzFlUsOACEIQz3CXMr7X2m2hlT5tCIJK2FeGxid3xjTyV2czmxdNavBMDNsVNfF9jR18teeF/4VzJWNdFiParbaRwf3RS87d1Zzlc/Ot7r3Sr8Ztmqfs3wFNxqdfnd8FdeyK3oiehW+VdwbnAgXsZWalMxMX+X+iOo4aevaI8RHbMYP2qET93awvl7MRRXs3ez9e7YW9XrfjLw/u36bP3Yimrs=
+   eJzFlcsNwDAIQzNCl8r+K/WKEBA+BpC4tHEeBtTe75z7SC2sd/xcNrNRYUbY0rkp9qumST7VbPhHMClbqoN7RLPRPia4G9rq3Ks1Z/nV+Wb3Huk3wkbtc5SP4Hpj0q/Gr3C5D8kbMqxeTUYXU+vhq9fomrS9zDAjuogHT32eO6h+a4+8M/bex59Z3O7w+urc643ZUm7222xprb5qOulOz/9H0/P8Ae8smBM=
   </data>
  </layer>
- <objectgroup name="Mapevents" width="30" height="30">
+ <objectgroup name="Mapevents" width="30" height="30" visible="0">
   <object name="north" type="mapchange" x="288" y="0" width="192" height="32">
    <properties>
     <property name="map" value="waterway5"/>
@@ -157,7 +157,7 @@
     <property name="place" value="west"/>
    </properties>
   </object>
-  <object name="west" type="mapchange" x="0" y="864" width="32" height="32">
+  <object name="west" type="mapchange" x="0" y="608" width="32" height="32">
    <properties>
     <property name="map" value="waytobrimhaven3"/>
     <property name="place" value="east"/>
@@ -202,7 +202,7 @@
     <property name="quantity" value="2"/>
    </properties>
   </object>
-  <object name="erumen_1" type="spawn" x="128" y="640" width="768" height="288">
+  <object name="erumen_1" type="spawn" x="160" y="640" width="736" height="288">
    <properties>
     <property name="quantity" value="3"/>
    </properties>
diff --git a/AndorsTrail/res/xml/waytobrimhaven0.tmx b/AndorsTrail/res/xml/waytobrimhaven0.tmx
index c7b48dc76..9898d4970 100644
--- a/AndorsTrail/res/xml/waytobrimhaven0.tmx
+++ b/AndorsTrail/res/xml/waytobrimhaven0.tmx
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
-<map version="1.0" orientation="orthogonal" width="33" height="16" tilewidth="32" tileheight="32">
+<map version="1.0" orientation="orthogonal" width="32" height="16" tilewidth="32" tileheight="32">
  <properties>
   <property name="outside" value="1"/>
  </properties>
@@ -124,28 +124,28 @@
  <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
   <image source="../drawable/map_window_2.png"/>
  </tileset>
- <layer name="Ground" width="33" height="16">
+ <layer name="Ground" width="32" height="16">
   <data encoding="base64" compression="zlib">
-   eJwzYmdgMMKBj7LhliMHg8zDhgnpGS5ucIRiervBkQi7qeUGRxyYkL3Y3IDLHFx2kGMXLkxNs0bxKKYGNhwE6RGULw3JxNR0A7mYWm6jZp2EzW2E7P8kQBs34AsrdDcwCTIwAACAoCEP
+   eJwzYmdgMMKBj7LhliMVg8zChgnpGer2O0IxPe13JMJeatnviAUTshOb/bjMwSZOrl3YMLXMGcWjmBxsOMBpD5T3DMnE1LKfXEwNN1GrfsHmJkJ2fxKgvv34wgfdfiZBBgYAk1UY4Q==
   </data>
  </layer>
- <layer name="Objects" width="33" height="16">
+ <layer name="Objects" width="32" height="16">
   <data encoding="base64" compression="zlib">
-   eJylVUFug0AMdFDVE0jLkYf0E0RVz6lE76XqY/q9JnwgKAj1BV2XdTHGXrKJpZHYxfKMx0ZUBUBlYO8AnooZl3x5jqFXcrHexyMAlAA7j9Gff9ya92u31oB313JbQP2kofPPf+F1ZOWktwo5Wz5ovaX405APLDQfYho4xoS5HDxvHdAGDd/57IPGTd6k7AP3CGen8Z59zilf+gCGBkIT8UHrsVZ4tTgKHbQLVq0tIJesyXmObP/wW+BBnmzV+p+diJWnIQbjPha1s/Hpppz2ynv+HjW2Iv/ZLbkfiqk/8uGVzY/3PUhPYX2mfMubjt1rXqPOF4/3G/cBtZ+Vul3CTDLvx1tkHjHEtJOv1Pdip9h+oneogQO/bXlnwdIutfE5U/Dd3eK5KDpTtGl6OrE/t3BI9BE/pR75v+A+aHXumZOGvdQQduIXtkKFHw==
+   eJydVEsKwkAMjSKuWhiXPYiXaBHXCrq34mG8ntoLVBTxBCa2wTTNTKcGHtjpmPdJNEsBMg8KB7BMf3gk3Wcf7sY96nWcA8ACYIJ44fPb9TnPkz4/ncXw+kC6mb/Cz99CDdNFozVr7wz5t3zF5rJj/6Is/yF+iVfkLDbImbcoW/5L8vNv8XImY+bP2dCsLM4a39+Srn/w8DN2Af+WP81p1VVp4NlbfWJAXLonP1/FrtHOy+IsQn24LsZ5L0usp+f7ocqdHyfX3Ckjz/kdaSvV3ZXr8s7Sxhf734qZSb9PnSX0n/m+lUklzqx8SeMacfhz/qS7Vn2rEXOYYg77wAxC8OnmLNlvZ3/ELlJexC9Bv1995oOlW2uSc+WSezrE8TA0xmqytFRqV8b2t3BXPThDrUX//0v/uoeFMbPRKDR/uwMfG9GCVA==
   </data>
  </layer>
- <layer name="Above" width="33" height="16">
+ <layer name="Above" width="32" height="16">
   <data encoding="base64" compression="zlib">
-   eJxjYBgFlIDf3JSb8UGAMnO5eSh3Az3NHSwAFO4fsYT9KBgFgwEMl/RJjTKSUkDNsozS8poW9oMAPcpr9DQJAHRSDXg=
+   eJxjYBgF5IDf3JTp/yBAmZncPJTZTy8zBwMAhfVHLOE9CkYBvcFwSIuUln2UAmqVU5SWwdS2GwRoXQajpz8AKkMNeA==
   </data>
  </layer>
- <layer name="Walkable" width="33" height="16">
+ <layer name="Walkable" width="32" height="16">
   <data encoding="base64" compression="zlib">
-   eJxzFWBgcB2BGAYGgxsG0h0DZT8uMFD20sIdpNhDyA0jGQyGcKBn2qOlG8jNj/RwA7FhRS834HPPQLthIOzHlg4Aw9R23w==
+   eJxzFWBgcB1BGAYG2v6BcsNA2I0LDISdtHADsXYQsn8kgoH2Pz3TGq3sJyfP0dp+YsOHHvbjc8tA2k9vu7HFOwAf7nM4
   </data>
  </layer>
- <objectgroup name="Mapevents" width="33" height="16">
-  <object name="east" type="mapchange" x="1024" y="160" width="32" height="288">
+ <objectgroup name="Mapevents" width="32" height="16">
+  <object name="east" type="mapchange" x="992" y="160" width="32" height="288">
    <properties>
     <property name="map" value="waytobrimhaven1"/>
     <property name="place" value="west"/>
@@ -158,17 +158,17 @@
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Spawn" width="33" height="16">
-  <object name="fieldcritter_0" type="spawn" x="320" y="192" width="352" height="160">
+ <objectgroup name="Spawn" width="32" height="16">
+  <object name="fieldcritter_0" type="spawn" x="288" y="192" width="352" height="160">
    <properties>
     <property name="quantity" value="2"/>
    </properties>
   </object>
-  <object name="fieldcritter_1" type="spawn" x="672" y="32" width="320" height="416">
+  <object name="fieldcritter_1" type="spawn" x="640" y="32" width="320" height="416">
    <properties>
     <property name="quantity" value="3"/>
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Keys" width="33" height="16"/>
+ <objectgroup name="Keys" width="32" height="16"/>
 </map>
diff --git a/AndorsTrail/res/xml/waytobrimhaven3.tmx b/AndorsTrail/res/xml/waytobrimhaven3.tmx
index 2211b31a7..7a9c3b7cf 100644
--- a/AndorsTrail/res/xml/waytobrimhaven3.tmx
+++ b/AndorsTrail/res/xml/waytobrimhaven3.tmx
@@ -131,12 +131,12 @@
  </layer>
  <layer name="Objects" width="30" height="30">
   <data encoding="base64" compression="zlib">
-   eJylVzFu3DAQpK+WAQZ5QQJcXpIqBzilCwfxDy5VVAVOda7S5yt+h0pJV1hw5TMM2y8IN+GYo9HSCZAFCOsoamdndrmkhyaELoYQXoVwlMZDen5Mo0/zMH7P6/7H9sn/lHyMwIH/ZE/xz7O9Rzy2voaJuGq/a8YclT/H42Hh3W8futbDFv9D1r1X/o62Gse+mf8ehAd/18UyDz9TnntJW1s7ErfR0crM5pWD+Z9iicvWIOaBfAJTNX2Rn/OeOdm7r06dtMT5X62n+Bcm9Qr7eTQfim+m2rK/BZZozWbzhvFutQxvvSr4bfRr+W/Gup8kHx9o/KDxJY1DWvv+eI4PbOUGv4vaF7NcbrJupvFK1pxJLm8bB7tirCWemeN5jtswDfsbje+xYKkB+5rqcXLi4BoGR91jhn1Twbmj+QPxvvY4O/qegKMTE+rZ8rPLz4hjSzlnY47efkGuwXUSzsgv98cd+fyUnznnpgHXF+Noz9jEZd8A5pNz/hm2+b+gnJtp3ms1Bl6f0/uPkWKimrK/vZy/Xm9j031ttpdeMpDWnIsZ31ByMEjP1JrjWltTr2mZVyixbyQu5vt8vga/T5txH2HzuLPxProSbOiD+rCeWdvDZqqBrfV6mhnnuBfsjrh6fZpj2Mq+Oji6t3HePze0nnnz+ctm2l7mb7C/LnJ93znrmfcz98wZvRLcr5qSX3A9iE/c7czuHTzVXXM+Uj/lGJAPjwPevaa6Muxa/qvnWPDvNPb3NC6/bWO5j7xJ82+lrlUbtbVTL3yPecx6cJ90+Yel1ujj3MtvpN68e4zuI8bGN5Z76HAZ52vQT7mnwlg78OD8d8J9F30NDZPXqO9a3reOFn1T/g9B7eLuDt/mzzC5j/P5BS4cF7S7bcr+MwMfvrdbH8E9HbXf017jPs7+O1rL5wviZy3HPP8L9U4Nww==
+   eJylVzFu3DAQpK+WAQZ5QQxcXpIqBzhligTxDy5VVAVOda7c5yt+h0pJV1hw5TMM2y8IN+GYo9HSCZABCOsoandndrmkhyaELoYQXoVwlMZDen5Mo0/zAL/ndf+DfbI/JRsj/MB+wlP882zvEY+tr/lEXLXfNTBH5c/xeL7w7rcNXev5FvtD1r1X/o62Gse+mf8ehAd/18UyDztTnntJW1s7ErfR0cpg88rB7E+xxGVrEPNANuFTNX2Rn/OeOdm7b06dtMT5X9FT/AtIvQI/j+ZD/RtUW7a38CVaM2zefLxdLcNbr4r/Nvq1/Dew7qfJxnsalzS+pnFIa98dz/3Dt3KD3UXtCyyXm6ybabySNZ8kl7eN47sC1hLPzPEsx20+zfd3Gj9i8aWA72uqx8mJg2sYHHWPme+bip87mj8Q72uPs6PvKTg6MaGeLT+7/Iw4tpRzBnP09gtyDa6TcEZ+uT/uyObn/Mw5Nw24vtiP9oxNXPYN+Hxyzj/zbfbPKecGzXutxsDrS3r/IVJMVFP2t5fz1+ttDN3Xhr30koG05lzgXMUZMVFc3DO15rjW1tRrWuYVSuwbict4vkm94eSYztfg92kD9xGGx53B++hKtIY+qA/rmbU9bFANbK3X0wyc4158d8TV69Mcw1b21cHRvY3z/rmh9cybz1+GaXuRv8H+Os/1feesZ97P3DNn9Epwv2pKfsH1IDafazDh3vGnumvOR+qnHAPy4XHAu9dUV+a7lv/qORb8O439/RiX37ax3EdQ/wzVRrF26oXvMY9ZD+6TLv+w1Bp9nHv5jdSbd4/RfcS+8Y3lHjpcxPka9FPuqQBrBx6c/06476KvofnkNWq7lveto0XflP9DULu4u8O22TOf3Mf5/AIXjgva3TZl/xnAh+/t1kdwT0ft97TXuI+z/Y7W8vmC+FnLMc//Ah0hDBk=
   </data>
  </layer>
  <layer name="Above" width="30" height="30">
   <data encoding="base64" compression="zlib">
-   eJztlc0RgjAQhYNnDqQ6O5BKbJAO6ACsQHPIzI7u/waDM36XDCTwsi+PJSWabUppn+j5x2vuku0j986NmaM0K9R1HYcs14TWnj/fLaGtl3q2PFP2UDWxfVO1VO3FqIt5asWjGQF6ALMzK3K7I95SnnL3ITdK15EhlmxfK2Vf823ANeto2EMAqSdwwDxas9kabe/5Ju+eRLz21hfR9HKUZosz5nqXF0291w7nUGole6YCj99RTS9n8rdFTrl+itWq/T9HkDw+6gzunXQleuT8z+/yBP5aVmQ=
+   eJztlcsNwjAQRA3nHOLq6IBUQoN0QAcJFYAPK1nBs1+bCIl3iRLbGc94s0kJs84pbTMef77Hztl+5d65MmNIk0D3dD1l2VPTe/58t4TWL1pb1pQ9kGZr38gLad+Nuq1MrXg0I9QZ1LWzKOp2a2SLMuWe11yRrqOGWLJ9rlT7mm+jnvOYDHsIIPUEjroerbXZG23v+Sb7TCJZe/1FNL2M0uxxxlzv8qLxexl4DvQ/21O8wp6pwJN3VNPLyHwRyGuPOuX6acur9v8cQcp41BncDtKVOKLO//wuL1CWWGU=
   </data>
  </layer>
  <layer name="Walkable" width="30" height="30">