diff --git a/AndorsTrail/res/xml/worldmap.xml b/AndorsTrail/res/xml/worldmap.xml
index 637b49f77..f43aedee5 100644
--- a/AndorsTrail/res/xml/worldmap.xml
+++ b/AndorsTrail/res/xml/worldmap.xml
@@ -1,203 +1,250 @@
 <?xml version="1.0" encoding="utf-8"?>
 <worldmap>
-<segment id="waytobrimhavencave" x="318" y="262">
- <map id="waytobrimhavencave0" x="349" y="262" />
- <map id="waytobrimhavencave1" x="380" y="270" />
- <map id="waytobrimhavencave2" x="411" y="270" />
- <map id="waytobrimhavencave3" x="442" y="270" />
- <map id="waytobrimhavencave4" x="318" y="270" />
- <map id="waytobrimhavencave1a" x="349" y="291" />
+<segment id="waytobrimhavencave" x="319" y="270">
+ <map id="waytobrimhavencave0" x="350" y="270" />
+ <map id="waytobrimhavencave1" x="381" y="278" />
+ <map id="waytobrimhavencave2" x="412" y="278" />
+ <map id="waytobrimhavencave3" x="443" y="278" />
+ <map id="waytobrimhavencave4" x="319" y="278" />
+ <map id="waytobrimhavencave1a" x="350" y="299" />
 </segment>
-<segment id="bwcave1" x="69" y="225">
- <map id="blackwater_mountain39" x="118" y="225" />
- <map id="blackwater_mountain19" x="86" y="232" />
- <map id="blackwater_mountain17" x="69" y="256" />
- <map id="blackwater_mountain18" x="70" y="233" />
- <map id="blackwater_mountain20" x="97" y="231" />
+<segment id="bwcave1" x="69" y="233">
+ <map id="blackwater_mountain39" x="118" y="233" />
+ <map id="blackwater_mountain19" x="86" y="240" />
+ <map id="blackwater_mountain17" x="69" y="264" />
+ <map id="blackwater_mountain18" x="70" y="241" />
+ <map id="blackwater_mountain20" x="97" y="239" />
 </segment>
-<segment id="flagstone" x="124" y="483">
- <map id="flagstone2" x="124" y="483" />
- <map id="flagstone3" x="130" y="514" />
- <map id="flagstone4" x="151" y="510" />
+<segment id="flagstone" x="124" y="491">
+ <map id="flagstone2" x="124" y="491" />
+ <map id="flagstone3" x="130" y="522" />
+ <map id="flagstone4" x="151" y="518" />
 </segment>
 <segment id="world1" x="11" y="0">
- <map id="waytobrimhaven2" x="333" y="237" />
- <map id="waytobrimhaven3" x="364" y="239" />
- <map id="waytobrimhaven0" x="269" y="251" />
- <map id="waytobrimhaven1" x="302" y="247" />
- <map id="roadtocarntower1" x="117" y="300" />
- <map id="roadtocarntower0" x="148" y="300" />
- <map id="roadtocarntower2" x="86" y="300" />
- <map id="fields9" x="117" y="284" />
- <map id="waterway9" x="550" y="228" />
- <map id="fields6" x="179" y="224" />
- <map id="waterway8" x="519" y="228" />
- <map id="fields5" x="148" y="222" />
- <map id="fields8" x="148" y="284" />
- <map id="fields7" x="210" y="228" />
- <map id="fields2" x="148" y="253" />
- <map id="fields1" x="179" y="253" />
- <map id="fields4" x="210" y="253" />
- <map id="fields3" x="127" y="263" />
- <map id="woodcave0" x="201" y="331" />
- <map id="fields0" x="179" y="284" />
- <map id="fallhaven_nw" x="210" y="382" area="fallhaven" />
- <map id="waterway12" x="457" y="228" />
- <map id="waterway11" x="581" y="228" />
- <map id="mountainlake10a" x="724" y="31" />
- <map id="waterway14" x="403" y="166" />
- <map id="waterway13" x="488" y="228" />
- <map id="blackwater_mountain4" x="14" y="403" />
- <map id="waterway15" x="411" y="197" />
- <map id="waterway11_east" x="612" y="229" />
- <map id="fallhaven_ne" x="241" y="382" area="fallhaven" />
- <map id="waterway10" x="550" y="259" />
- <map id="wild3" x="173" y="386" />
- <map id="wild2" x="152" y="386" />
- <map id="wild5" x="159" y="407" />
- <map id="wild4" x="201" y="351" />
- <map id="wild7" x="147" y="459" />
- <map id="wild6" x="155" y="428" />
- <map id="wild9" x="186" y="434" />
- <map id="wild8" x="126" y="468" />
- <map id="blackwater_mountain0" x="53" y="469" />
- <map id="roadbeforecrossroads" x="210" y="318" />
- <map id="blackwater_mountain1" x="11" y="441" />
- <map id="blackwater_mountain2" x="11" y="430" />
- <map id="blackwater_mountain3" x="14" y="419" />
- <map id="wild1" x="179" y="353" />
- <map id="wild0" x="179" y="331" />
- <map id="wild17" x="32" y="455" />
- <map id="wild15" x="335" y="448" />
- <map id="mountainlake13a" x="648" y="50" />
- <map id="wild16" x="74" y="469" />
- <map id="wild13" x="293" y="436" />
- <map id="flagstone0" x="95" y="469" area="flagstone" />
- <map id="wild14" x="314" y="441" />
- <map id="wild11" x="238" y="434" />
- <map id="wild12" x="272" y="426" />
- <map id="wild10" x="217" y="434" />
- <map id="waterway6" x="395" y="228" />
- <map id="waterway7" x="426" y="228" />
- <map id="waterway4" x="372" y="166" />
- <map id="waterway5" x="380" y="197" />
- <map id="waterway2" x="341" y="150" />
- <map id="waterway3" x="310" y="150" />
- <map id="waterway0" x="279" y="192" />
- <map id="waterway1" x="310" y="171" />
- <map id="road4_gargoylecave" x="425" y="438" />
- <map id="waytomountaincave1" x="621" y="285" />
- <map id="waytomountaincave0" x="627" y="255" />
- <map id="waytomountaincave2" x="622" y="305" />
- <map id="wild11_clearing" x="241" y="455" />
- <map id="fallhaven_sw" x="210" y="413" area="fallhaven" />
- <map id="waterwayextention" x="342" y="181" />
- <map id="mountainlake3" x="756" y="128" />
- <map id="mountainlake2" x="735" y="141" />
- <map id="mountainlake1" x="704" y="128" />
- <map id="mountainlake0" x="702" y="159" />
- <map id="mountainlake7" x="800" y="53" />
- <map id="mountainlake6" x="795" y="74" />
- <map id="mountainlake5" x="787" y="104" />
- <map id="mountainlake4" x="761" y="111" />
- <map id="mountainlake9" x="763" y="0" />
- <map id="vilegard_sw" x="349" y="505" />
- <map id="mountainlake8" x="779" y="31" />
- <map id="gapfiller1" x="259" y="434" />
- <map id="gapfiller2" x="186" y="407" />
- <map id="gapfiller3" x="179" y="375" />
- <map id="fallhaven_se" x="241" y="413" area="fallhaven" />
- <map id="gapfiller4" x="194" y="382" />
- <map id="fields10" x="96" y="284" />
- <map id="fields11" x="238" y="218" />
- <map id="waytolake0" x="649" y="266" />
- <map id="fields12" x="259" y="214" />
- <map id="vilegard_n" x="360" y="471" area="vilegard" />
- <map id="waytolake3" x="672" y="208" />
- <map id="vilegard_s" x="360" y="492" area="vilegard" />
- <map id="waytolake1" x="670" y="255" />
- <map id="waytolake2" x="670" y="229" />
- <map id="mountainlake13" x="640" y="20" />
- <map id="mountainlake12" x="671" y="8" />
- <map id="mountainlake11" x="701" y="4" />
- <map id="mountainlake10" x="732" y="0" />
- <map id="loneford2" x="238" y="251" area="loneford" />
- <map id="loneford1" x="210" y="278" />
- <map id="crossglen" x="148" y="355" area="crossglen" />
- <map id="remgard1" x="673" y="83" area="remgard" />
- <map id="remgard0" x="642" y="76" area="remgard" />
- <map id="remgard3" x="652" y="107" area="remgard" />
- <map id="remgard2" x="673" y="114" area="remgard" />
- <map id="remgard4" x="621" y="107" area="remgard" />
- <map id="road1" x="356" y="445" area="fflask" />
- <map id="crossroads" x="179" y="300" area="crossroads" />
- <map id="road3" x="403" y="459" />
- <map id="road2" x="382" y="455" />
- <map id="road5" x="455" y="462" />
- <map id="road4" x="429" y="454" />
- <namedarea id="crossglen" name="Crossglen" type="settlement"/>
- <namedarea id="loneford" name="Loneford" type="settlement"/>
- <namedarea id="flagstone" name="Flagstone Prison" type="other"/>
- <namedarea id="fallhaven" name="Fallhaven" type="settlement"/>
- <namedarea id="fflask" name="Foaming Flask Tavern" type="other"/>
- <namedarea id="crossroads" name="Crossroads Guardhouse" type="other"/>
- <namedarea id="remgard" name="Remgard" type="settlement"/>
- <namedarea id="vilegard" name="Vilegard" type="settlement"/>
+ <map id="lodar21" x="374" y="373" />
+ <map id="lodar20" x="374" y="342" />
+ <map id="waytominingtown1a" x="375" y="415" />
+ <map id="waytobrimhaven2" x="334" y="245" />
+ <map id="waytobrimhaven3" x="365" y="247" />
+ <map id="waytobrimhaven0" x="269" y="259" />
+ <map id="waytobrimhaven1" x="303" y="255" />
+ <map id="roadtocarntower1" x="117" y="308" />
+ <map id="roadtocarntower0" x="148" y="308" />
+ <map id="woodsettlement0" x="202" y="375" />
+ <map id="roadtocarntower2" x="86" y="308" />
+ <map id="lodar8" x="312" y="330" />
+ <map id="lodar9" x="343" y="285" />
+ <map id="lodar6" x="262" y="330" />
+ <map id="lodar7" x="281" y="330" />
+ <map id="lodar4" x="312" y="304" />
+ <map id="lodar5" x="281" y="314" />
+ <map id="fields9" x="117" y="292" />
+ <map id="lodar2" x="281" y="283" />
+ <map id="lodar3" x="312" y="283" />
+ <map id="lodar10" x="374" y="285" />
+ <map id="waterway9" x="551" y="228" />
+ <map id="fields6" x="179" y="232" />
+ <map id="waterway8" x="520" y="228" />
+ <map id="fields5" x="148" y="230" />
+ <map id="lodar12" x="374" y="311" />
+ <map id="fields8" x="148" y="292" />
+ <map id="lodar11" x="343" y="311" />
+ <map id="fields7" x="210" y="236" />
+ <map id="lodar14" x="293" y="361" />
+ <map id="fields2" x="148" y="261" />
+ <map id="lodar13" x="262" y="361" />
+ <map id="fields1" x="179" y="261" />
+ <map id="lodar16" x="313" y="361" />
+ <map id="fields4" x="210" y="261" />
+ <map id="lodar15" x="293" y="392" />
+ <map id="fields3" x="127" y="271" />
+ <map id="lodar18" x="343" y="342" />
+ <map id="lodar17" x="313" y="392" />
+ <map id="fields0" x="179" y="292" />
+ <map id="lodar19" x="343" y="373" />
+ <map id="wild14_clearing" x="318" y="433" />
+ <map id="fallhaven_nw" x="210" y="390" />
+ <map id="waterway12" x="458" y="228" />
+ <map id="waterway11" x="582" y="228" />
+ <map id="mountainlake10a" x="725" y="31" />
+ <map id="waterway14" x="404" y="166" />
+ <map id="waterway13" x="489" y="228" />
+ <map id="blackwater_mountain4" x="14" y="411" />
+ <map id="waterway15" x="412" y="197" />
+ <map id="waterway11_east" x="613" y="229" />
+ <map id="fallhaven_ne" x="241" y="390" />
+ <map id="waterway10" x="551" y="259" />
+ <map id="wild3" x="173" y="394" />
+ <map id="wild2" x="152" y="394" />
+ <map id="wild5" x="159" y="415" />
+ <map id="wild4" x="201" y="359" />
+ <map id="wild7" x="147" y="467" />
+ <map id="wild6" x="155" y="436" />
+ <map id="wild9" x="186" y="450" />
+ <map id="wild8" x="126" y="476" />
+ <map id="blackwater_mountain0" x="53" y="477" />
+ <map id="blackwater_mountain1" x="11" y="449" />
+ <map id="roadbeforecrossroads" x="210" y="326" />
+ <map id="blackwater_mountain2" x="11" y="438" />
+ <map id="blackwater_mountain3" x="14" y="427" />
+ <map id="wild1" x="179" y="361" />
+ <map id="wild0" x="179" y="339" />
+ <map id="wild17" x="32" y="463" />
+ <map id="wild15" x="335" y="456" />
+ <map id="roadbeforecrossroads8" x="335" y="428" />
+ <map id="mountainlake13a" x="649" y="50" />
+ <map id="wild16" x="74" y="477" />
+ <map id="roadbeforecrossroads9" x="356" y="428" />
+ <map id="wild13" x="293" y="444" />
+ <map id="roadbeforecrossroads6" x="293" y="413" />
+ <map id="flagstone0" x="95" y="477" />
+ <map id="wild14" x="314" y="449" />
+ <map id="roadbeforecrossroads7" x="314" y="428" />
+ <map id="wild11" x="238" y="442" />
+ <map id="roadbeforecrossroads4" x="272" y="390" />
+ <map id="wild12" x="272" y="434" />
+ <map id="roadbeforecrossroads5" x="272" y="411" />
+ <map id="roadbeforecrossroads2" x="232" y="356" />
+ <map id="wild10" x="217" y="442" />
+ <map id="roadbeforecrossroads3" x="262" y="374" />
+ <map id="waterway6" x="396" y="228" />
+ <map id="waterway7" x="427" y="228" />
+ <map id="waterway4" x="373" y="166" />
+ <map id="waterway5" x="381" y="197" />
+ <map id="waterway2" x="342" y="158" />
+ <map id="waterway3" x="311" y="158" />
+ <map id="waterway0" x="280" y="200" />
+ <map id="waterway1" x="311" y="179" />
+ <map id="road4_gargoylecave" x="425" y="446" />
+ <map id="lodar1" x="232" y="318" />
+ <map id="lodar0" x="250" y="299" />
+ <map id="waytomountaincave1" x="622" y="285" />
+ <map id="waytomountaincave0" x="628" y="255" />
+ <map id="waytomountaincave2" x="623" y="305" />
+ <map id="wild11_clearing" x="241" y="463" />
+ <map id="fallhaven_sw" x="210" y="421" />
+ <map id="waterwayextention" x="343" y="189" />
+ <map id="mountainlake3" x="757" y="128" />
+ <map id="waytominingtown0" x="314" y="412" />
+ <map id="mountainlake2" x="736" y="141" />
+ <map id="waytominingtown1" x="344" y="397" />
+ <map id="mountainlake1" x="705" y="128" />
+ <map id="waytominingtown2" x="375" y="394" />
+ <map id="mountainlake0" x="703" y="159" />
+ <map id="waytominingtown3" x="395" y="386" />
+ <map id="mountainlake7" x="801" y="53" />
+ <map id="mountainlake6" x="796" y="74" />
+ <map id="mountainlake5" x="788" y="104" />
+ <map id="mountainlake4" x="762" y="111" />
+ <map id="mountainlake9" x="764" y="0" />
+ <map id="vilegard_sw" x="349" y="513" />
+ <map id="mountainlake8" x="780" y="31" />
+ <map id="gapfiller1" x="259" y="442" />
+ <map id="lostmine0" x="426" y="369" />
+ <map id="gapfiller3" x="179" y="383" />
+ <map id="fallhaven_se" x="241" y="421" />
+ <map id="gapfiller4" x="194" y="390" />
+ <map id="fields10" x="96" y="292" />
+ <map id="waytolake0" x="650" y="266" />
+ <map id="fields11" x="238" y="226" />
+ <map id="fields12" x="259" y="222" />
+ <map id="vilegard_n" x="360" y="479" />
+ <map id="waytolostmine0" x="395" y="355" />
+ <map id="roadbeforecrossroads1" x="232" y="330" />
+ <map id="waytolake3" x="673" y="208" />
+ <map id="vilegard_s" x="360" y="500" />
+ <map id="waytolake1" x="671" y="255" />
+ <map id="waytolake2" x="671" y="229" />
+ <map id="waytolostmine2" x="426" y="309" />
+ <map id="waytolostmine1" x="395" y="327" />
+ <map id="waytolostmine3" x="426" y="338" />
+ <map id="mountainlake13" x="641" y="20" />
+ <map id="mountainlake12" x="672" y="8" />
+ <map id="mountainlake11" x="702" y="4" />
+ <map id="mountainlake10" x="733" y="0" />
+ <map id="loneford2" x="238" y="259" />
+ <map id="loneford1" x="210" y="286" />
+ <map id="crossglen" x="148" y="363" />
+ <map id="remgard1" x="674" y="83" />
+ <map id="remgard0" x="643" y="76" />
+ <map id="remgard3" x="653" y="107" />
+ <map id="remgard2" x="674" y="114" />
+ <map id="remgard4" x="622" y="107" />
+ <map id="road1" x="356" y="453" />
+ <map id="crossroads" x="179" y="308" />
+ <map id="road3" x="403" y="467" />
+ <map id="road2" x="382" y="463" />
+ <map id="road5" x="455" y="470" />
+ <map id="road4" x="429" y="462" />
 </segment>
-<segment id="blackwater" x="10" y="206">
- <map id="blackwater_mountain15" x="81" y="294" />
- <map id="blackwater_mountain16" x="83" y="263" />
- <map id="blackwater_mountain40" x="77" y="346" />
- <map id="blackwater_mountain32" x="128" y="206" />
- <map id="blackwater_mountain14" x="60" y="325" />
- <map id="blackwater_mountain11" x="39" y="294" area="prim" />
- <map id="blackwater_mountain30" x="130" y="237" />
- <map id="blackwater_mountain12" x="10" y="315" />
- <map id="blackwater_mountain10" x="39" y="325" />
- <namedarea id="prim" name="Prim" type="settlement"/>
+<segment id="blackwater" x="10" y="214">
+ <map id="blackwater_mountain15" x="81" y="302" />
+ <map id="blackwater_mountain16" x="83" y="271" />
+ <map id="blackwater_mountain40" x="77" y="354" />
+ <map id="blackwater_mountain32" x="128" y="214" />
+ <map id="blackwater_mountain14" x="60" y="333" />
+ <map id="blackwater_mountain11" x="39" y="302" />
+ <map id="blackwater_mountain30" x="130" y="245" />
+ <map id="blackwater_mountain12" x="10" y="323" />
+ <map id="blackwater_mountain10" x="39" y="333" />
 </segment>
-<segment id="pwcave" x="287" y="34">
- <map id="pwcave4" x="318" y="91" />
- <map id="pwcave2a" x="291" y="34" />
- <map id="pwcave2" x="287" y="60" />
- <map id="pwcave3" x="318" y="60" />
- <map id="pwcave0" x="307" y="122" />
- <map id="pwcave1" x="287" y="91" />
+<segment id="pwcave" x="288" y="42">
+ <map id="pwcave4" x="319" y="99" />
+ <map id="pwcave2a" x="292" y="42" />
+ <map id="pwcave2" x="288" y="68" />
+ <map id="pwcave3" x="319" y="68" />
+ <map id="pwcave0" x="308" y="130" />
+ <map id="pwcave1" x="288" y="99" />
 </segment>
-<segment id="snakecave" x="115" y="345">
- <map id="snakecave2" x="123" y="376" />
- <map id="snakecave1" x="144" y="376" />
- <map id="snakecave3" x="115" y="345" />
+<segment id="snakecave" x="115" y="353">
+ <map id="snakecave2" x="123" y="384" />
+ <map id="snakecave1" x="144" y="384" />
+ <map id="snakecave3" x="115" y="353" />
 </segment>
-<segment id="bwentry" x="14" y="342">
- <map id="blackwater_mountain7" x="34" y="366" />
- <map id="blackwater_mountain6" x="23" y="380" />
- <map id="blackwater_mountain5" x="14" y="391" />
- <map id="blackwater_mountain9" x="42" y="342" />
+<segment id="bwentry" x="14" y="350">
+ <map id="blackwater_mountain7" x="34" y="374" />
+ <map id="blackwater_mountain6" x="23" y="388" />
+ <map id="blackwater_mountain5" x="14" y="399" />
+ <map id="blackwater_mountain9" x="42" y="350" />
 </segment>
-<segment id="gargoylecave" x="395" y="403">
- <map id="gargoylecave3" x="395" y="403" />
- <map id="gargoylecave4" x="411" y="415" />
- <map id="gargoylecave1" x="420" y="424" />
- <map id="gargoylecave2" x="399" y="424" />
+<segment id="gargoylecave" x="395" y="411">
+ <map id="gargoylecave3" x="395" y="411" />
+ <map id="gargoylecave4" x="411" y="423" />
+ <map id="gargoylecave1" x="420" y="432" />
+ <map id="gargoylecave2" x="399" y="432" />
 </segment>
-<segment id="mountaincave" x="599" y="245">
- <map id="mountaincave3" x="599" y="245" />
- <map id="mountaincave2" x="602" y="266" />
- <map id="mountaincave1" x="614" y="297" />
- <map id="mountaincave0" x="635" y="297" />
+<segment id="lodarcave" x="309" y="283">
+ <map id="lodarcave4a" x="361" y="366" />
+ <map id="lodarcave7" x="373" y="420" />
+ <map id="lodarcave5" x="348" y="387" />
+ <map id="lodarcave6" x="352" y="408" />
+ <map id="lodarcave3" x="323" y="335" />
+ <map id="lodarcave4" x="335" y="366" />
+ <map id="lodarcave1" x="309" y="283" />
+ <map id="lodarcave2" x="319" y="314" />
 </segment>
-<segment id="bwcave2" x="105" y="200">
- <map id="blackwater_mountain37" x="136" y="211" />
- <map id="blackwater_mountain38" x="105" y="217" />
- <map id="blackwater_mountain36" x="134" y="200" />
+<segment id="mountaincave" x="600" y="245">
+ <map id="mountaincave3" x="600" y="245" />
+ <map id="mountaincave2" x="603" y="266" />
+ <map id="mountaincave1" x="615" y="297" />
+ <map id="mountaincave0" x="636" y="297" />
 </segment>
-<segment id="bwsettlement" x="113" y="158">
- <map id="blackwater_mountain51" x="138" y="235" />
- <map id="blackwater_mountain52" x="138" y="204" />
- <map id="blackwater_mountain43" x="150" y="158" />
- <map id="blackwater_mountain44" x="129" y="183" />
- <map id="blackwater_mountain45" x="113" y="197" />
- <map id="blackwater_mountain46" x="116" y="189" />
+<segment id="bwcave2" x="105" y="208">
+ <map id="blackwater_mountain37" x="136" y="219" />
+ <map id="blackwater_mountain38" x="105" y="225" />
+ <map id="blackwater_mountain36" x="134" y="208" />
+</segment>
+<segment id="lodar5cave" x="284" y="322">
+ <map id="lodar5cave1" x="305" y="352" />
+ <map id="lodar5cave0" x="297" y="322" />
+ <map id="lodar5cave2" x="284" y="376" />
+</segment>
+<segment id="bwsettlement" x="113" y="166">
+ <map id="blackwater_mountain51" x="138" y="243" />
+ <map id="blackwater_mountain52" x="138" y="212" />
+ <map id="blackwater_mountain43" x="150" y="166" />
+ <map id="blackwater_mountain44" x="129" y="191" />
+ <map id="blackwater_mountain45" x="113" y="205" />
+ <map id="blackwater_mountain46" x="116" y="197" />
 </segment>
 </worldmap>