diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java
index e56ba310d9cb94372ed965850a37703fb0a52090..94bca3a38fe52125a44318e112b098f9a83cbba0 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java
@@ -104,7 +104,7 @@ public final class DispelBySlot extends AbstractEffect
 				continue;
 			}
 			
-			if ((entry.getKey() == toDispel.getSkill().getAbnormalType()) && (entry.getValue() >= toDispel.getSkill().getAbnormalLvl()))
+			if ((entry.getKey() == toDispel.getSkill().getAbnormalType()) && ((entry.getValue() < 0) || (entry.getValue() >= toDispel.getSkill().getAbnormalLvl())))
 			{
 				effectList.stopSkillEffects(true, entry.getKey());
 			}
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/02200-02299.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/02200-02299.xml
index d15293bad91b7e35f315ac07da1999d76ca42058..eee6a6dd7cad2d9127fb9100d3f1e70c373ac9d8 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/02200-02299.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/02200-02299.xml
@@ -863,46 +863,73 @@
 		<set name="effectRange" val="300" />
 		<set name="isMagic" val="2" /> <!-- Static Skill -->
 		<set name="itemConsumeCount" val="1" />
-		<set name="itemConsumeId" val="8379" />
+		<set name="itemConsumeId" val="8030" />
 		<set name="magicLvl" val="1" />
 		<set name="operateType" val="A1" />
 		<set name="reuseDelay" val="2000" />
 		<set name="targetType" val="ONE" />
 		<cond msgId="113" addName="1">
-			<player insideZoneId="2240123" />
+			<and>
+				<player insideZoneId="2240123" />
+				<target npcRace="HUMANOID" />
+			</and>
 		</cond>
 	</skill>
 	<skill id="2241" levels="1" name="Hot Spring Mineral Water">
+		<!-- Confirmed CT2.5 -->
+		<set name="castRange" val="40" />
 		<set name="effectPoint" val="100" />
+		<set name="effectRange" val="300" />
 		<set name="isMagic" val="2" /> <!-- Static Skill -->
+		<set name="itemConsumeCount" val="1" />
+		<set name="itemConsumeId" val="8031" />
 		<set name="magicLvl" val="1" />
 		<set name="operateType" val="A1" />
 		<set name="reuseDelay" val="2000" />
-		<set name="targetType" val="NONE" />
+		<set name="targetType" val="ONE" />
 		<cond msgId="113" addName="1">
-			<player insideZoneId="2240123" />
+			<and>
+				<player insideZoneId="2240123" />
+				<target npcRace="HUMANOID" />
+			</and>
 		</cond>
 	</skill>
 	<skill id="2242" levels="1" name="Hot Spring Fountain Water">
+		<!-- Confirmed CT2.5 -->
+		<set name="castRange" val="40" />
 		<set name="effectPoint" val="100" />
+		<set name="effectRange" val="300" />
 		<set name="isMagic" val="2" /> <!-- Static Skill -->
+		<set name="itemConsumeCount" val="1" />
+		<set name="itemConsumeId" val="8032" />
 		<set name="magicLvl" val="1" />
 		<set name="operateType" val="A1" />
 		<set name="reuseDelay" val="2000" />
-		<set name="targetType" val="NONE" />
+		<set name="targetType" val="ONE" />
 		<cond msgId="113" addName="1">
-			<player insideZoneId="2240123" />
+			<and>
+				<player insideZoneId="2240123" />
+				<target npcRace="HUMANOID" />
+			</and>
 		</cond>
 	</skill>
 	<skill id="2243" levels="1" name="Hot Spring Sulfur">
+		<!-- Confirmed CT2.5 -->
+		<set name="castRange" val="40" />
 		<set name="effectPoint" val="100" />
+		<set name="effectRange" val="300" />
 		<set name="isMagic" val="2" /> <!-- Static Skill -->
+		<set name="itemConsumeCount" val="1" />
+		<set name="itemConsumeId" val="8032" />
 		<set name="magicLvl" val="1" />
 		<set name="operateType" val="A1" />
 		<set name="reuseDelay" val="2000" />
-		<set name="targetType" val="NONE" />
+		<set name="targetType" val="ONE" />
 		<cond msgId="113" addName="1">
-			<player insideZoneId="2240123" />
+			<and>
+				<player insideZoneId="2240123" />
+				<target npcRace="HUMANOID" />
+			</and>
 		</cond>
 	</skill>
 	<skill id="2244" levels="1" name="Herb of Life">
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/02500-02599.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/02500-02599.xml
index f944a581b666a54dec8eb2ecc0f63536c03c26cf..575d5ee4e70e7be816d39564402bcce726527968 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/02500-02599.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/02500-02599.xml
@@ -478,10 +478,18 @@
 		</for>
 	</skill>
 	<skill id="2530" levels="1" name="Recovery Item for Battlefield Use">
+		<!-- Confirmed CT2.5 -->
 		<set name="isMagic" val="2" /> <!-- Static Skill -->
+		<set name="itemConsumeCount" val="1" />
+		<set name="itemConsumeId" val="12819" />
 		<set name="magicLvl" val="1" />
 		<set name="operateType" val="A1" />
-		<set name="targetType" val="NONE" />
+		<set name="targetType" val="SELF" />
+		<for>
+			<effect name="DispelBySlot">
+				<param dispel="DEATH_PENALTY,-1" />
+			</effect>
+		</for>
 	</skill>
 	<skill id="2531" levels="1" name="Adventurer's Scroll of Escape">
 		<set name="hitTime" val="20000" />