diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Assassin/Evade.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Assassin/Evade.java
index 80f7d18f4..9bb502b84 100644
--- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Assassin/Evade.java
+++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Assassin/Evade.java
@@ -57,7 +57,7 @@ public class Evade extends SkillActive
 	@Override
 	public String GetEnergyString()
 	{
-		return "Energy: #30#-4 and #24#-4 per Second";
+		return "Energy: #30#-2 and #24#-4 per Second";
 	}
 
 	@Override
diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Global/Fitness.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Global/Fitness.java
index 9cd7a34f0..48ce9ac86 100644
--- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Global/Fitness.java
+++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Global/Fitness.java
@@ -14,14 +14,14 @@ public class Fitness extends Skill
 
 		SetDesc(new String[] 
 				{
-				"Maximum Energy is increased by #0#30 ( #0#16 %)."
+				"Maximum Energy is increased by #0#27 ( #0#15 %)."
 				});
 	}
 	
 	@Override
 	public void OnPlayerAdd(Player player)
 	{
-		Factory.Energy().AddEnergyMaxMod(player, GetName(), 60);
+		Factory.Energy().AddEnergyMaxMod(player, GetName(), 18 * getLevel(player));
 	}
 	
 	@Override
diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Knight/Swordsmanship.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Knight/Swordsmanship.java
index f5d983f2b..f803ac8e6 100644
--- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Knight/Swordsmanship.java
+++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Knight/Swordsmanship.java
@@ -28,7 +28,7 @@ public class Swordsmanship extends Skill
 				{
 				"Prepare a powerful sword attack;",
 				"You gain 1 Charge every #5#-1 seconds.",
-				"You can store a maximum of #2#1 Charges.",
+				"You can store a maximum of #0#1 Charges.",
 				"",
 				"When you next attack, your damage is",
 				"increased by the number of your Charges,",
@@ -81,7 +81,7 @@ public class Swordsmanship extends Skill
 			if (_charges.containsKey(cur))
 				charge += _charges.get(cur);
 			
-			charge = Math.min(2 + level, charge);
+			charge = Math.min(level, charge);
 			
 			_charges.put(cur, charge);
 		}
diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Ranger/Overcharge.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Ranger/Overcharge.java
index a36af720a..605510ed3 100644
--- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Ranger/Overcharge.java
+++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Ranger/Overcharge.java
@@ -107,7 +107,7 @@ public class Overcharge extends SkillChargeBow
 		{
 			Arrow arrow = arrowIterator.next();
 			
-			if (arrow.isDead() || !arrow.isValid())
+			if (arrow.isDead() || !arrow.isValid() || arrow.isOnGround())
 				arrowIterator.remove();
 		}
 	}
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/champions_dominate/Dominate.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/champions_dominate/Dominate.java
index fd16b20e1..8acc95c74 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/champions_dominate/Dominate.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/champions_dominate/Dominate.java
@@ -96,7 +96,7 @@ public class Dominate extends TeamGame
 	} 
  
 	@Override  
-	public void ParseData() 
+	public void ParseData()  
 	{ 
 		for (String pointName : WorldData.GetAllCustomLocs().keySet())
 		{