diff --git a/L2J_Mobius_Classic/dist/game/data/residences/clanHalls/Floran/BlackBarracks.xml b/L2J_Mobius_Classic/dist/game/data/residences/clanHalls/Floran/BlackBarracks.xml
new file mode 100644
index 0000000000..83fa996a19
--- /dev/null
+++ b/L2J_Mobius_Classic/dist/game/data/residences/clanHalls/Floran/BlackBarracks.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../xsd/clanHall.xsd">
+	<clanHall id="73" name="Black Barracks" grade="GRADE_B" type="AUCTIONABLE">
+	 	<auction minBid="100000000" lease="40000000" deposit="45000000" />
+	 	<npcs>
+	 	   	<npc id="36738" /> <!-- Ludina -->
+   			<npc id="36737" /> <!-- Gairin -->
+	 	</npcs>
+	 	<doorlist>
+	 		<door id="20230101" />
+	 		<door id="20230102" />
+	 	</doorlist>
+	 	<teleportList>
+			<teleport npcStringId="1010024" x="19025" y="145245" z="-3107" minFunctionLevel="1" cost="0" /> <!-- Village Square -->
+			<teleport npcStringId="1010026" x="21511" y="145866" z="-3153" minFunctionLevel="1" cost="0" /> <!-- East Gate Entrance -->
+			<teleport npcStringId="1010025" x="18891" y="142365" z="-3051" minFunctionLevel="1" cost="0" /> <!-- North Gate Entrance -->
+			<teleport npcStringId="1010028" x="17394" y="147593" z="-3129" minFunctionLevel="1" cost="0" /> <!-- South Gate Entrance -->
+			<teleport npcStringId="1010027" x="16582" y="144130" z="-2960" minFunctionLevel="1" cost="0" /> <!-- West Gate Entrance -->
+			<teleport npcStringId="1010614" x="5106" y="126916" z="-3664" minFunctionLevel="2" cost="2000" /> <!-- Cruma Marshlands (Lv. 25) -->
+			<teleport npcStringId="1010113" x="47382" y="111278" z="-2104" minFunctionLevel="2" cost="2000" /> <!-- Fortress of Resistance (Lv. 23) -->
+			<teleport npcStringId="1010111" x="630" y="179184" z="-3720" minFunctionLevel="2" cost="2000" /> <!-- Plains of Dion (Lv. 23) -->
+			<teleport npcStringId="1010115" x="60374" y="164301" z="-2856" minFunctionLevel="2" cost="2000" /> <!-- Tanor Canyon (Lv. 46) -->
+			<teleport npcStringId="1010164" x="-15901" y="30661" z="-3616" minFunctionLevel="2" cost="2000" /> <!-- Bloody Swampland (Lv. 85) -->
+			<teleport npcStringId="1010652" x="-74506" y="53435" z="-3680" minFunctionLevel="2" cost="2000" /> <!-- Isle of Souls Harbor(Lv. 93) -->
+			<teleport npcStringId="1010723" x="-115854" y="236285" z="-3088" minFunctionLevel="2" cost="2000" /> <!-- Ruins of Ye Sagira (Lv. 85) -->
+			<teleport npcStringId="1010114" x="44725" y="146026" z="-3512" minFunctionLevel="2" cost="2000" /> <!-- Guilloutine Fortress (Lv. 95) -->
+			<teleport npcStringId="1010718" x="149363" y="173599" z="-920" minFunctionLevel="2" cost="2000" /> <!-- Parnassus -->
+			<teleport npcStringId="1010604" x="185006" y="20913" z="-3168" minFunctionLevel="2" cost="2000" /> <!-- Seal of Shilen (Lv. 95) -->
+			<teleport npcStringId="1010036" x="17430" y="170103" z="-3506" minFunctionLevel="2" cost="10000" /> <!-- Entrance to Floran Village -->
+			<teleport npcStringId="1010200" x="43889" y="-49101" z="-792" minFunctionLevel="2" cost="10000" /> <!-- Town of Rune -->
+			<teleport npcStringId="1010023" x="147450" y="28081" z="-2294" minFunctionLevel="2" cost="10000" /> <!-- Town of Aden -->
+			<teleport npcStringId="1010001" x="-114353" y="255211" z="-1520" minFunctionLevel="2" cost="10000" /> <!-- Talking Island Village -->
+			<teleport npcStringId="1010003" x="11247" y="16049" z="-4584" minFunctionLevel="2" cost="10000" /> <!-- The Dark Elf Village -->
+			<teleport npcStringId="1010007" x="81749" y="149171" z="-3464" minFunctionLevel="2" cost="10000" /> <!-- The Town of Giran -->
+			<teleport npcStringId="1010730" x="-149464" y="255062" z="-80" minFunctionLevel="2" cost="10000" /> <!-- Gludio Wharf -->
+	 	</teleportList>
+	 	<ownerRestartPoint x="17194" y="169658" z="-3486" />
+		<banishPoint x="18318" y="170344" z="-3501" />
+	</clanHall>
+</list>
\ No newline at end of file
diff --git a/L2J_Mobius_Classic/dist/game/data/residences/clanHalls/Floran/GreenBarracks.xml b/L2J_Mobius_Classic/dist/game/data/residences/clanHalls/Floran/GreenBarracks.xml
new file mode 100644
index 0000000000..2ade1d1ced
--- /dev/null
+++ b/L2J_Mobius_Classic/dist/game/data/residences/clanHalls/Floran/GreenBarracks.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../xsd/clanHall.xsd">
+	<clanHall id="74" name="Green Barracks" grade="GRADE_B" type="AUCTIONABLE">
+	 	<auction minBid="100000000" lease="40000000" deposit="45000000" />
+	 	<npcs>
+	 	   	<npc id="36740" /> <!-- Danif -->
+   			<npc id="36739" /> <!-- Flon -->
+	 	</npcs>
+	 	<doorlist>
+	 		<door id="20230103" />
+	 		<door id="20230104" />
+	 	</doorlist>
+	 	<teleportList>
+			<teleport npcStringId="1010024" x="19025" y="145245" z="-3107" minFunctionLevel="1" cost="0" /> <!-- Village Square -->
+			<teleport npcStringId="1010026" x="21511" y="145866" z="-3153" minFunctionLevel="1" cost="0" /> <!-- East Gate Entrance -->
+			<teleport npcStringId="1010025" x="18891" y="142365" z="-3051" minFunctionLevel="1" cost="0" /> <!-- North Gate Entrance -->
+			<teleport npcStringId="1010028" x="17394" y="147593" z="-3129" minFunctionLevel="1" cost="0" /> <!-- South Gate Entrance -->
+			<teleport npcStringId="1010027" x="16582" y="144130" z="-2960" minFunctionLevel="1" cost="0" /> <!-- West Gate Entrance -->
+			<teleport npcStringId="1010614" x="5106" y="126916" z="-3664" minFunctionLevel="2" cost="2000" /> <!-- Cruma Marshlands (Lv. 25) -->
+			<teleport npcStringId="1010113" x="47382" y="111278" z="-2104" minFunctionLevel="2" cost="2000" /> <!-- Fortress of Resistance (Lv. 23) -->
+			<teleport npcStringId="1010111" x="630" y="179184" z="-3720" minFunctionLevel="2" cost="2000" /> <!-- Plains of Dion (Lv. 23) -->
+			<teleport npcStringId="1010115" x="60374" y="164301" z="-2856" minFunctionLevel="2" cost="2000" /> <!-- Tanor Canyon (Lv. 46) -->
+			<teleport npcStringId="1010164" x="-15901" y="30661" z="-3616" minFunctionLevel="2" cost="2000" /> <!-- Bloody Swampland (Lv. 85) -->
+			<teleport npcStringId="1010652" x="-74506" y="53435" z="-3680" minFunctionLevel="2" cost="2000" /> <!-- Isle of Souls Harbor(Lv. 93) -->
+			<teleport npcStringId="1010723" x="-115854" y="236285" z="-3088" minFunctionLevel="2" cost="2000" /> <!-- Ruins of Ye Sagira (Lv. 85) -->
+			<teleport npcStringId="1010114" x="44725" y="146026" z="-3512" minFunctionLevel="2" cost="2000" /> <!-- Guilloutine Fortress (Lv. 95) -->
+			<teleport npcStringId="1010718" x="149363" y="173599" z="-920" minFunctionLevel="2" cost="2000" /> <!-- Parnassus -->
+			<teleport npcStringId="1010604" x="185006" y="20913" z="-3168" minFunctionLevel="2" cost="2000" /> <!-- Seal of Shilen (Lv. 95) -->
+			<teleport npcStringId="1010036" x="17430" y="170103" z="-3506" minFunctionLevel="2" cost="10000" /> <!-- Entrance to Floran Village -->
+			<teleport npcStringId="1010200" x="43889" y="-49101" z="-792" minFunctionLevel="2" cost="10000" /> <!-- Town of Rune -->
+			<teleport npcStringId="1010023" x="147450" y="28081" z="-2294" minFunctionLevel="2" cost="10000" /> <!-- Town of Aden -->
+			<teleport npcStringId="1010001" x="-114353" y="255211" z="-1520" minFunctionLevel="2" cost="10000" /> <!-- Talking Island Village -->
+			<teleport npcStringId="1010003" x="11247" y="16049" z="-4584" minFunctionLevel="2" cost="10000" /> <!-- The Dark Elf Village -->
+			<teleport npcStringId="1010007" x="81749" y="149171" z="-3464" minFunctionLevel="2" cost="10000" /> <!-- The Town of Giran -->
+			<teleport npcStringId="1010730" x="-149464" y="255062" z="-80" minFunctionLevel="2" cost="10000" /> <!-- Gludio Wharf -->
+	 	</teleportList>
+	 	<ownerRestartPoint x="17965" y="170734" z="-3491" />
+		<banishPoint x="18318" y="170344" z="-3501" />
+	</clanHall>
+</list>
\ No newline at end of file
diff --git a/L2J_Mobius_Classic/dist/game/data/spawns/Aden/Aden.xml b/L2J_Mobius_Classic/dist/game/data/spawns/Aden/Aden.xml
index 9379f06be4..d48cbb0421 100644
--- a/L2J_Mobius_Classic/dist/game/data/spawns/Aden/Aden.xml
+++ b/L2J_Mobius_Classic/dist/game/data/spawns/Aden/Aden.xml
@@ -77,7 +77,6 @@
 			<npc id="35269" x="147362" y="6111" z="-400" heading="49152" respawnTime="10800sec"/>
 			<npc id="35266" x="147457" y="4609" z="-2789" heading="0" respawnTime="60sec"/>
 			<npc id="35276" x="147952" y="3742" z="-307" heading="32768" respawnTime="60sec"/>
-			<npc id="31001" x="148700" y="16834" z="-1559" heading="0" respawnTime="60sec"/>
 			<npc id="35271" x="147408" y="2320" z="221" heading="16000" respawnTime="60sec"/>
 			<npc id="35271" x="147552" y="2128" z="221" heading="48000" respawnTime="60sec"/>
 			<npc id="30837" x="146787" y="26255" z="-2189" heading="32768" respawnTime="60sec"/>
@@ -130,10 +129,8 @@
 			<npc id="35448" x="144352" y="27165" z="-2264" heading="0" respawnTime="60sec"/>
 			<npc id="35447" x="144237" y="27172" z="-2248" heading="33000" respawnTime="60sec"/>
 			<npc id="35450" x="144462" y="28125" z="-2264" heading="0" respawnTime="60sec"/>
-			<npc id="31445" x="150912" y="28112" z="-2246" heading="25000" respawnTime="60sec"/>
 			<npc id="31613" x="144172" y="23664" z="-2118" heading="33000" respawnTime="60sec"/>
 			<npc id="31614" x="145928" y="22768" z="-2116" heading="25000" respawnTime="60sec"/>
-			<npc id="30767" x="148560" y="27104" z="-2208" heading="33000" respawnTime="60sec"/>
 			<npc id="30865" x="144512" y="25696" z="-2125" heading="32768" respawnTime="60sec"/>
 			<npc id="30866" x="144496" y="25360" z="-2124" heading="16384" respawnTime="60sec"/>
 			<npc id="30867" x="143856" y="25696" z="-2125" heading="0" respawnTime="60sec"/>
diff --git a/L2J_Mobius_Classic/dist/game/data/spawns/Dion/DionMonsterSpawns.xml b/L2J_Mobius_Classic/dist/game/data/spawns/Dion/DionMonsterSpawns.xml
index eca7b18645..b3d88f2b73 100644
--- a/L2J_Mobius_Classic/dist/game/data/spawns/Dion/DionMonsterSpawns.xml
+++ b/L2J_Mobius_Classic/dist/game/data/spawns/Dion/DionMonsterSpawns.xml
@@ -933,7 +933,6 @@
 			<npc id="21103" x="14859" y="149688" z="-3350" heading="18200" respawnTime="30sec"/>
 			<npc id="21103" x="14604" y="151433" z="-3231" heading="23512" respawnTime="30sec"/>
 			<npc id="21103" x="14775" y="150542" z="-3601" heading="0" respawnTime="30sec"/>
-			<npc id="21104" x="15842" y="153399" z="-3556" heading="14760" respawnTime="30sec"/>
 			<npc id="21104" x="12812" y="150229" z="-3348" heading="41760" respawnTime="30sec"/>
 			<npc id="21102" x="7704" y="148510" z="-3031" heading="57877" respawnTime="30sec"/>
 			<npc id="21102" x="7670" y="147571" z="-2673" heading="52167" respawnTime="30sec"/>
@@ -973,28 +972,11 @@
 			<npc id="21104" x="11120" y="158586" z="-2740" heading="49003" respawnTime="30sec"/>
 			<npc id="21105" x="10259" y="159952" z="-3732" heading="0" respawnTime="30sec"/>
 			<npc id="21105" x="12505" y="159503" z="-3190" heading="36989" respawnTime="30sec"/>
-			<npc id="21102" x="14896" y="158329" z="-3505" heading="27444" respawnTime="30sec"/>
-			<npc id="21102" x="14350" y="156767" z="-3462" heading="29458" respawnTime="30sec"/>
-			<npc id="21103" x="15997" y="157838" z="-3564" heading="18049" respawnTime="30sec"/>
-			<npc id="21103" x="17055" y="155794" z="-3630" heading="56702" respawnTime="30sec"/>
-			<npc id="21104" x="15671" y="156352" z="-3601" heading="49698" respawnTime="30sec"/>
-			<npc id="21104" x="15534" y="159602" z="-3504" heading="4254" respawnTime="30sec"/>
 			<npc id="21104" x="14104" y="161284" z="-3565" heading="24892" respawnTime="30sec"/>
-			<npc id="21104" x="13889" y="157602" z="-3273" heading="36193" respawnTime="30sec"/>
-			<npc id="21105" x="16772" y="157571" z="-3562" heading="55707" respawnTime="30sec"/>
-			<npc id="21105" x="14265" y="158784" z="-3294" heading="14331" respawnTime="30sec"/>
 			<npc id="21102" x="15996" y="152686" z="-3533" heading="52686" respawnTime="30sec"/>
-			<npc id="21102" x="15238" y="155269" z="-3537" heading="6332" respawnTime="30sec"/>
-			<npc id="21103" x="15853" y="154207" z="-3732" heading="0" respawnTime="30sec"/>
-			<npc id="21103" x="15954" y="154029" z="-3732" heading="0" respawnTime="30sec"/>
-			<npc id="21103" x="13016" y="155682" z="-3082" heading="25662" respawnTime="30sec"/>
-			<npc id="21104" x="13791" y="154264" z="-3126" heading="33302" respawnTime="30sec"/>
-			<npc id="21104" x="17354" y="154085" z="-3549" heading="59491" respawnTime="30sec"/>
 			<npc id="21104" x="14236" y="152782" z="-3301" heading="41664" respawnTime="30sec"/>
-			<npc id="21104" x="14030" y="155641" z="-3403" heading="47997" respawnTime="30sec"/>
 			<npc id="21103" x="8301" y="152750" z="-3140" heading="49911" respawnTime="30sec"/>
 			<npc id="21103" x="10787" y="155185" z="-2521" heading="59093" respawnTime="30sec"/>
-			<npc id="21103" x="12204" y="157162" z="-2799" heading="9205" respawnTime="30sec"/>
 			<npc id="21104" x="9652" y="151532" z="-3246" heading="42286" respawnTime="30sec"/>
 			<npc id="21104" x="9969" y="154395" z="-2668" heading="44874" respawnTime="30sec"/>
 			<npc id="21104" x="12390" y="153106" z="-2994" heading="10738" respawnTime="30sec"/>
@@ -1015,11 +997,9 @@
 			<npc id="21103" x="8342" y="162304" z="-3843" heading="0" respawnTime="30sec"/>
 			<npc id="21105" x="9589" y="160745" z="-3537" heading="52166" respawnTime="30sec"/>
 			<npc id="21105" x="9081" y="162339" z="-3580" heading="51885" respawnTime="30sec"/>
-			<npc id="21103" x="15077" y="160727" z="-3519" heading="60124" respawnTime="30sec"/>
 			<npc id="21103" x="13113" y="162070" z="-3573" heading="2490" respawnTime="30sec"/>
 			<npc id="21104" x="9583" y="163665" z="-3666" heading="26144" respawnTime="30sec"/>
 			<npc id="21104" x="14441" y="161997" z="-3843" heading="0" respawnTime="30sec"/>
-			<npc id="21104" x="17070" y="160529" z="-3515" heading="64857" respawnTime="30sec"/>
 			<npc id="21104" x="7100" y="160849" z="-3546" heading="12452" respawnTime="30sec"/>
 			<npc id="21104" x="7612" y="162392" z="-3626" heading="52182" respawnTime="30sec"/>
 			<npc id="21104" x="7955" y="160360" z="-3488" heading="60505" respawnTime="30sec"/>
diff --git a/L2J_Mobius_Classic/dist/game/data/spawns/Giran/Giran.xml b/L2J_Mobius_Classic/dist/game/data/spawns/Giran/Giran.xml
index 92a9dc0b49..571398f4e7 100644
--- a/L2J_Mobius_Classic/dist/game/data/spawns/Giran/Giran.xml
+++ b/L2J_Mobius_Classic/dist/game/data/spawns/Giran/Giran.xml
@@ -29,7 +29,6 @@
 			<npc id="30113" x="85253" y="153153" z="-3494" heading="0" respawnTime="60sec"/>
 			<npc id="30114" x="85297" y="152963" z="-3494" heading="8192" respawnTime="60sec"/>
 			<npc id="30756" x="84521" y="146372" z="-3404" heading="16384" respawnTime="60sec"/>
-			<npc id="30753" x="81296" y="149728" z="-3469" heading="49152" respawnTime="60sec"/>
 			<npc id="30120" x="87058" y="148634" z="-3392" heading="32768" respawnTime="60sec"/>
 			<npc id="30116" x="86912" y="148802" z="-3392" heading="40960" respawnTime="60sec"/>
 			<npc id="30118" x="86485" y="148384" z="-3392" heading="16384" respawnTime="60sec"/>
diff --git a/L2J_Mobius_Classic/dist/game/data/spawns/Gludin/GludinVillage.xml b/L2J_Mobius_Classic/dist/game/data/spawns/Gludin/GludinVillage.xml
index 2739d39e5e..5e0561fc7f 100644
--- a/L2J_Mobius_Classic/dist/game/data/spawns/Gludin/GludinVillage.xml
+++ b/L2J_Mobius_Classic/dist/game/data/spawns/Gludin/GludinVillage.xml
@@ -44,11 +44,6 @@
 			<npc id="30501" x="-80448" y="153408" z="-3176" heading="32000" respawnTime="60sec" /> <!-- Kasman -->
 			<npc id="30502" x="-80448" y="153208" z="-3176" heading="32000" respawnTime="60sec" /> <!-- Umos -->
 			<npc id="30634" x="-81199" y="151904" z="-3120" heading="27000" respawnTime="60sec" /> <!-- Galatea -->
-			<npc id="30767" x="-81424" y="151699" z="-3120" heading="49152" respawnTime="60sec" > <!-- Auctioneer -->
-				<parameters>
-					<param name="fnAgitMap" value="gludin"/>
-				</parameters>
-			</npc>
 			<npc id="31031" x="-81280" y="154369" z="-3165" heading="16384" respawnTime="5sec" /> <!-- Broadcasting Tower -->
 			<npc id="31046" x="-81520" y="152256" z="-3120" heading="49376" respawnTime="60sec" /> <!-- Marsden -->
 			<npc id="31688" x="-84816" y="151056" z="-3120" respawnTime="60sec" /> <!-- Olympiad Manager -->
diff --git a/L2J_Mobius_Classic/dist/game/data/spawns/Others/17_22.xml b/L2J_Mobius_Classic/dist/game/data/spawns/Others/17_22.xml
new file mode 100644
index 0000000000..7bcaba8649
--- /dev/null
+++ b/L2J_Mobius_Classic/dist/game/data/spawns/Others/17_22.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/spawns.xsd">
+	<spawn name="17_22">
+		<group>
+			<npc id="30012" x="-79369" y="153318" z="-3160" heading="25270" respawnTime="60sec" /> <!-- Fishing Guild Member -->
+			<npc id="30939" x="-81825" y="155266" z="-3168" heading="48909" respawnTime="60sec" /> <!-- Jones -->
+		</group>
+	</spawn>
+</list>
diff --git a/L2J_Mobius_Classic/dist/game/data/spawns/Others/17_25.xml b/L2J_Mobius_Classic/dist/game/data/spawns/Others/17_25.xml
new file mode 100644
index 0000000000..48bab9c14e
--- /dev/null
+++ b/L2J_Mobius_Classic/dist/game/data/spawns/Others/17_25.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/spawns.xsd">
+	<spawn name="17_25">
+		<group>
+			<npc id="32478" x="-81920" y="243360" z="-3728" heading="38440" respawnTime="60sec" /> <!-- Dimensional Merchant -->
+		</group>
+	</spawn>
+</list>
diff --git a/L2J_Mobius_Classic/dist/game/data/spawns/Others/18_14.xml b/L2J_Mobius_Classic/dist/game/data/spawns/Others/18_14.xml
new file mode 100644
index 0000000000..507c0948f1
--- /dev/null
+++ b/L2J_Mobius_Classic/dist/game/data/spawns/Others/18_14.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/spawns.xsd">
+	<spawn name="18_14">
+		<group>
+			<npc id="32478" x="-43728" y="-113472" z="-240" heading="32599" respawnTime="60sec" /> <!-- Dimensional Merchant -->
+		</group>
+	</spawn>
+</list>
diff --git a/L2J_Mobius_Classic/dist/game/data/spawns/Others/19_21.xml b/L2J_Mobius_Classic/dist/game/data/spawns/Others/19_21.xml
new file mode 100644
index 0000000000..b91be90b9e
--- /dev/null
+++ b/L2J_Mobius_Classic/dist/game/data/spawns/Others/19_21.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/spawns.xsd">
+	<spawn name="19_21">
+		<group>
+			<npc id="32478" x="-13283" y="124612" z="-3120" heading="48655" respawnTime="60sec" /> <!-- Dimensional Merchant -->
+			<npc id="33359" x="-14764" y="122994" z="-3112" respawnTime="60sec" /> <!-- Kerry -->
+		</group>
+	</spawn>
+</list>
diff --git a/L2J_Mobius_Classic/dist/game/data/spawns/Others/20_18.xml b/L2J_Mobius_Classic/dist/game/data/spawns/Others/20_18.xml
new file mode 100644
index 0000000000..cb3abb97fe
--- /dev/null
+++ b/L2J_Mobius_Classic/dist/game/data/spawns/Others/20_18.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/spawns.xsd">
+	<spawn name="20_18">
+		<group>
+			<npc id="32478" x="13436" y="17248" z="-4568" heading="46596" respawnTime="60sec" /> <!-- Dimensional Merchant -->
+		</group>
+	</spawn>
+</list>
diff --git a/L2J_Mobius_Classic/dist/game/data/spawns/Others/20_22.xml b/L2J_Mobius_Classic/dist/game/data/spawns/Others/20_22.xml
new file mode 100644
index 0000000000..2674e0001b
--- /dev/null
+++ b/L2J_Mobius_Classic/dist/game/data/spawns/Others/20_22.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/spawns.xsd">
+	<spawn name="20_22">
+		<group>
+			<npc id="33359" x="18890" y="145933" z="-3072" heading="48351" respawnTime="60sec" /> <!-- Kerry -->
+			<npc id="31597" x="19605" y="143308" z="-3024" heading="52981" respawnTime="60sec" /> <!-- Tobald -->
+			<npc id="34272" x="19550" y="143088" z="-3024" heading="10052" respawnTime="60sec" /> <!-- Mihai -->
+			<npc id="32478" x="20560" y="144788" z="-3080" heading="33127" respawnTime="60sec" /> <!-- Dimensional Merchant -->
+			<npc id="30767" x="16721" y="154985" z="-3624" heading="625" respawnTime="60sec" /> <!-- Auctioneer -->
+			<npc id="36730" x="16314" y="155714" z="-3632" heading="48583" respawnTime="60sec" /> <!-- Faolin -->
+			<npc id="36736" x="16043" y="154636" z="-3632" heading="65365" respawnTime="60sec" /> <!-- Lenning -->
+			<npc id="36732" x="15345" y="155887" z="-3624" heading="48698" respawnTime="60sec" /> <!-- Coren -->
+			<npc id="36734" x="14666" y="155348" z="-3504" heading="65224" respawnTime="60sec" /> <!-- Muren -->
+		</group>
+	</spawn>
+</list>
diff --git a/L2J_Mobius_Classic/dist/game/data/spawns/Others/20_23.xml b/L2J_Mobius_Classic/dist/game/data/spawns/Others/20_23.xml
new file mode 100644
index 0000000000..796f04fc10
--- /dev/null
+++ b/L2J_Mobius_Classic/dist/game/data/spawns/Others/20_23.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/spawns.xsd">
+	<spawn name="20_23">
+		<group>
+			<npc id="30012" x="17232" y="170528" z="-3496" heading="53187" respawnTime="60sec" /> <!-- Fishing Guild Member -->
+			<npc id="36738" x="17262" y="169863" z="-3496" heading="15748" respawnTime="60sec" /> <!-- Ludina -->
+			<npc id="32478" x="17740" y="169800" z="-3496" heading="20126" respawnTime="60sec" /> <!-- Dimensional Merchant -->
+			<npc id="30767" x="18084" y="169964" z="-3488" heading="19790" respawnTime="60sec" /> <!-- Auctioneer -->
+			<npc id="36740" x="17883" y="170537" z="-3504" heading="48775" respawnTime="60sec" /> <!-- Danif -->
+		</group>
+	</spawn>
+</list>
diff --git a/L2J_Mobius_Classic/dist/game/data/spawns/Others/21_19.xml b/L2J_Mobius_Classic/dist/game/data/spawns/Others/21_19.xml
new file mode 100644
index 0000000000..4205c39c3b
--- /dev/null
+++ b/L2J_Mobius_Classic/dist/game/data/spawns/Others/21_19.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/spawns.xsd">
+	<spawn name="21_19">
+		<group>
+			<npc id="32478" x="47600" y="49920" z="-2992" heading="33462" respawnTime="60sec" /> <!-- Dimensional Merchant -->
+		</group>
+	</spawn>
+</list>
diff --git a/L2J_Mobius_Classic/dist/game/data/spawns/Others/21_23.xml b/L2J_Mobius_Classic/dist/game/data/spawns/Others/21_23.xml
new file mode 100644
index 0000000000..8caad60412
--- /dev/null
+++ b/L2J_Mobius_Classic/dist/game/data/spawns/Others/21_23.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/spawns.xsd">
+	<spawn name="21_23">
+		<group>
+			<npc id="30013" x="48668" y="186341" z="-3480" heading="39805" respawnTime="60sec" /> <!-- Pierre -->
+			<npc id="30012" x="48765" y="186205" z="-3480" heading="39805" respawnTime="60sec" /> <!-- Fishing Guild Member -->
+		</group>
+	</spawn>
+</list>
diff --git a/L2J_Mobius_Classic/dist/game/data/spawns/Others/22_19.xml b/L2J_Mobius_Classic/dist/game/data/spawns/Others/22_19.xml
new file mode 100644
index 0000000000..5b6e9d3040
--- /dev/null
+++ b/L2J_Mobius_Classic/dist/game/data/spawns/Others/22_19.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/spawns.xsd">
+	<spawn name="22_19">
+		<group>
+			<npc id="32478" x="81788" y="55387" z="-1520" heading="16383" respawnTime="60sec" /> <!-- Dimensional Merchant -->
+			<npc id="30012" x="79774" y="54746" z="-1544" heading="16383" respawnTime="60sec" /> <!-- Fishing Guild Member -->
+			<npc id="31594" x="81402" y="54619" z="-1504" heading="16383" respawnTime="60sec" /> <!-- Mond -->
+		</group>
+	</spawn>
+</list>
diff --git a/L2J_Mobius_Classic/dist/game/data/spawns/Others/22_22.xml b/L2J_Mobius_Classic/dist/game/data/spawns/Others/22_22.xml
new file mode 100644
index 0000000000..7f0a13bafb
--- /dev/null
+++ b/L2J_Mobius_Classic/dist/game/data/spawns/Others/22_22.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/spawns.xsd">
+	<spawn name="22_22">
+		<group>
+			<npc id="33359" x="81388" y="149728" z="-3464" heading="49151" respawnTime="60sec" /> <!-- Kerry -->
+			<npc id="32478" x="82652" y="146755" z="-3464" heading="32767" respawnTime="60sec" /> <!-- Dimensional Merchant -->
+			<npc id="30936" x="80280" y="145713" z="-3528" respawnTime="60sec" /> <!-- Pona -->
+			<npc id="30020" x="80297" y="145262" z="-3528" respawnTime="60sec" /> <!-- Baggins -->
+			<npc id="30021" x="80291" y="145272" z="-3528" respawnTime="60sec" /> <!-- Baggins Deko -->
+			<npc id="30012" x="80512" y="147712" z="-3504" heading="32767" respawnTime="60sec" /> <!-- Fishing Guild Member -->
+			<npc id="34275" x="77503" y="148013" z="-3592" heading="16383" respawnTime="60sec" /> <!-- Jeris -->
+			<npc id="34276" x="77477" y="148068" z="-3592" respawnTime="60sec" /> <!-- Jeris' Anvil -->
+		</group>
+	</spawn>
+</list>
diff --git a/L2J_Mobius_Classic/dist/game/data/spawns/Others/23_12.xml b/L2J_Mobius_Classic/dist/game/data/spawns/Others/23_12.xml
new file mode 100644
index 0000000000..6f3c6d28b3
--- /dev/null
+++ b/L2J_Mobius_Classic/dist/game/data/spawns/Others/23_12.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/spawns.xsd">
+	<spawn name="23_12">
+		<group>
+			<npc id="32478" x="115020" y="-179728" z="-880" heading="65188" respawnTime="60sec" /> <!-- Dimensional Merchant -->
+		</group>
+	</spawn>
+</list>
diff --git a/L2J_Mobius_Classic/dist/game/data/spawns/Others/23_20.xml b/L2J_Mobius_Classic/dist/game/data/spawns/Others/23_20.xml
new file mode 100644
index 0000000000..b8a3a6412e
--- /dev/null
+++ b/L2J_Mobius_Classic/dist/game/data/spawns/Others/23_20.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/spawns.xsd">
+	<spawn name="23_20">
+		<group>
+			<npc id="32478" x="115656" y="76620" z="-2664" heading="58498" respawnTime="60sec" /> <!-- Dimensional Merchant -->
+		</group>
+	</spawn>
+</list>
diff --git a/L2J_Mobius_Classic/dist/game/data/spawns/Others/24_18.xml b/L2J_Mobius_Classic/dist/game/data/spawns/Others/24_18.xml
new file mode 100644
index 0000000000..3409770a38
--- /dev/null
+++ b/L2J_Mobius_Classic/dist/game/data/spawns/Others/24_18.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/spawns.xsd">
+	<spawn name="24_18">
+		<group>
+			<npc id="32478" x="148465" y="26654" z="-2200" heading="24329" respawnTime="60sec" /> <!-- Dimensional Merchant -->
+			<npc id="33359" x="148465" y="27156" z="-2200" heading="33121" respawnTime="60sec" /> <!-- Kerry -->
+			<npc id="30767" x="148009" y="28603" z="-2264" heading="52880" respawnTime="60sec" /> <!-- Auctioneer -->
+			<npc id="31778" x="146949" y="26684" z="-2200" heading="16383" respawnTime="60sec" /> <!-- Tores -->
+			<npc id="30942" x="147291" y="27373" z="-2200" heading="49449" respawnTime="60sec" /> <!-- Ruvard -->
+			<npc id="31001" x="145747" y="21312" z="-2136" heading="93" respawnTime="60sec" /> <!-- Claudia Athebaldt -->
+			<npc id="34266" x="150868" y="27428" z="-2264" respawnTime="60sec" /> <!-- Nazeph -->
+			<npc id="34273" x="150842" y="28483" z="-2248" heading="47671" respawnTime="60sec" /> <!-- Jeros -->
+			<npc id="34274" x="150862" y="28396" z="-2248" heading="32767" respawnTime="60sec" /> <!-- Jeros' Anvil -->
+			<npc id="34271" x="149188" y="30493" z="-2456" heading="32403" respawnTime="60sec" /> <!-- Roo-roo -->
+			<npc id="34268" x="147674" y="29591" z="-2264" heading="24575" respawnTime="60sec" /> <!-- Rifken -->
+			<npc id="34269" x="145920" y="28799" z="-2248" heading="65014" respawnTime="60sec" /> <!-- Tavoz -->
+			<npc id="30012" x="145891" y="28332" z="-2248" heading="65014" respawnTime="60sec" /> <!-- Fishing Guild Member -->
+		</group>
+	</spawn>
+</list>
diff --git a/L2J_Mobius_Classic/dist/game/data/stats/npcs/30000-30099.xml b/L2J_Mobius_Classic/dist/game/data/stats/npcs/30000-30099.xml
index a41464abf1..3e478a9230 100644
--- a/L2J_Mobius_Classic/dist/game/data/stats/npcs/30000-30099.xml
+++ b/L2J_Mobius_Classic/dist/game/data/stats/npcs/30000-30099.xml
@@ -362,7 +362,7 @@
 		</parameters>
 		<race>HUMAN</race>
 		<sex>MALE</sex>
-		<equipment rhand="7560" /> <!-- Monster Only (Fishing Rod) -->
+		<equipment rhand="49465" /> <!-- Fishing Rod (for NPC) -->
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="2444.46819" hpRegen="7.5" mp="1345.8" mpRegen="2.7" />
 			<attack physical="688.86373" magical="470.40463" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
@@ -584,10 +584,9 @@
 			<height normal="23" />
 		</collision>
 	</npc>
-	<npc id="30020" level="85" type="L2Npc" name="Baggins" title="Blacksmith">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
-		<sex>FEMALE</sex>
+	<npc id="30020" level="85" type="L2Merchant" name="Baggins" title="Blacksmith">
+		<race>DWARF</race>
+		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
 			<vitals hp="8446" hpRegen="10.5" mp="2355" mpRegen="3.6" />
 			<speed>
@@ -604,7 +603,6 @@
 		</collision>
 	</npc>
 	<npc id="30021" level="85" type="L2Npc" name="Baggins Deko">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
@@ -616,7 +614,7 @@
 			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
 			<defence physical="405.85106382979" magical="297.0297029703" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" talkable="false" targetable="false" />
 		<collision>
 			<radius normal="5" />
 			<height normal="12" />
@@ -3154,7 +3152,7 @@
 			<height normal="17" />
 		</collision>
 	</npc>
-	<npc id="30098" level="70" type="L2Npc" name="Alexandria" title="Armor Merchant">
+	<npc id="30098" level="70" type="L2Merchant" name="Alexandria" title="Armor Merchant">
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="90" />
diff --git a/L2J_Mobius_Classic/dist/game/data/stats/npcs/30900-30999.xml b/L2J_Mobius_Classic/dist/game/data/stats/npcs/30900-30999.xml
index b2aaaadf39..0d978a3e81 100644
--- a/L2J_Mobius_Classic/dist/game/data/stats/npcs/30900-30999.xml
+++ b/L2J_Mobius_Classic/dist/game/data/stats/npcs/30900-30999.xml
@@ -1369,7 +1369,7 @@
 			<height normal="17.5" />
 		</collision>
 	</npc>
-	<npc id="30936" level="70" type="L2Monster" name="Pona" title="Collector">
+	<npc id="30936" level="70" type="L2Merchant" name="Pona" title="Collector">
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="0" />
@@ -1483,7 +1483,7 @@
 			<height normal="29" />
 		</collision>
 	</npc>
-	<npc id="30939" level="70" type="L2Monster" name="Jones" title="Moon Knight">
+	<npc id="30939" level="70" type="L2Npc" name="Jones" title="Moon Knight">
 		<parameters>
 			<param name="MoveAroundSocial" value="80" />
 			<param name="MoveAroundSocial1" value="80" />
@@ -1597,7 +1597,7 @@
 			<height normal="28" />
 		</collision>
 	</npc>
-	<npc id="30942" level="70" type="L2Monster" name="Ruvard" title="Priest">
+	<npc id="30942" level="70" type="L2Npc" name="Ruvard" title="Priest">
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="0" />
diff --git a/L2J_Mobius_Classic/dist/game/data/stats/npcs/32400-32499.xml b/L2J_Mobius_Classic/dist/game/data/stats/npcs/32400-32499.xml
index 55e2427fa2..e69acc344b 100644
--- a/L2J_Mobius_Classic/dist/game/data/stats/npcs/32400-32499.xml
+++ b/L2J_Mobius_Classic/dist/game/data/stats/npcs/32400-32499.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/npcs.xsd">
-	<npc id="32478" level="70" type="L2Warehouse" name="Dimensional Merchant" title="Energy of Life">
+	<npc id="32478" level="70" type="L2Npc" name="Dimensional Merchant" title="Energy of Life">
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
diff --git a/L2J_Mobius_Classic/readme.txt b/L2J_Mobius_Classic/readme.txt
index efc8acf86c..e67527b5c6 100644
--- a/L2J_Mobius_Classic/readme.txt
+++ b/L2J_Mobius_Classic/readme.txt
@@ -12,6 +12,7 @@ What is done
 -Parsed NPC names from client
 -Temporary NPC info from Interlude retail files
 -Temporary spawns from Interlude retail files
+-Further manual spawn fixes
 -Skilltrees info from L2Wiki
 -Parsed NPC droplists from L2Wiki
 -Further manual NPC corrections from L2Wiki
@@ -29,7 +30,6 @@ Custom work
 TODO list
 -Retail gatekeeper teleports
 -Parse retail monster spawns by zone
--Make further manual spawn fixes
 -Retail NPC dialogs
 -Retail NPC buylists
 -Test quests and update rewards