diff --git a/src/main/java/com/seodisparate/TurnBasedMinecraft/common/Battle.java b/src/main/java/com/seodisparate/TurnBasedMinecraft/common/Battle.java
index 3e9ba40..19380dc 100644
--- a/src/main/java/com/seodisparate/TurnBasedMinecraft/common/Battle.java
+++ b/src/main/java/com/seodisparate/TurnBasedMinecraft/common/Battle.java
@@ -550,6 +550,9 @@ public class Battle
                         next = turnOrderQueue.poll();
                         continue;
                     }
+                    
+                    next.remainingDefenses = 0;
+                    
                     switch(next.decision)
                     {
                     case UNDECIDED:
@@ -580,9 +583,9 @@ public class Battle
                             {
                                 hitChance -= target.entityInfo.evasion;
                             }
-                            if(hitChance < 1)
+                            if(hitChance < TurnBasedMinecraftMod.config.getMinimumHitPercentage())
                             {
-                                hitChance = 1;
+                                hitChance = TurnBasedMinecraftMod.config.getMinimumHitPercentage();
                             }
                             if((int)(Math.random() * 100) < hitChance)
                             {
@@ -667,9 +670,9 @@ public class Battle
                             {
                                 hitChance -= target.entityInfo.evasion;
                             }
-                            if(hitChance < 1)
+                            if(hitChance < TurnBasedMinecraftMod.config.getMinimumHitPercentage())
                             {
-                                hitChance = 1;
+                                hitChance = TurnBasedMinecraftMod.config.getMinimumHitPercentage();
                             }
                             if((int)(Math.random() * 100) < hitChance)
                             {
diff --git a/src/main/java/com/seodisparate/TurnBasedMinecraft/common/Config.java b/src/main/java/com/seodisparate/TurnBasedMinecraft/common/Config.java
index e3534c8..00961c7 100644
--- a/src/main/java/com/seodisparate/TurnBasedMinecraft/common/Config.java
+++ b/src/main/java/com/seodisparate/TurnBasedMinecraft/common/Config.java
@@ -33,6 +33,7 @@ public class Config
     private int defenseDuration = 1;
     private int fleeGoodProbability = 90;
     private int fleeBadProbability = 40;
+    private int minimumHitPercentage = 1;
     
     public Config(Logger logger)
     {
@@ -206,6 +207,14 @@ public class Config
                 {
                     fleeBadProbability = Integer.parseInt(xmlReader.getElementText());
                 }
+                else if(xmlReader.getLocalName().equals("MinimumHitPercentage"))
+                {
+                    minimumHitPercentage = Integer.parseInt(xmlReader.getElementText());
+                    if(minimumHitPercentage < 1)
+                    {
+                        minimumHitPercentage = 1;
+                    }
+                }
                 else if(xmlReader.getLocalName().equals("EntityStats"))
                 {
                     do
@@ -455,4 +464,9 @@ public class Config
     {
         return ignoreBattleTypes.contains(type);
     }
+    
+    public int getMinimumHitPercentage()
+    {
+        return minimumHitPercentage;
+    }
 }
diff --git a/src/main/java/com/seodisparate/TurnBasedMinecraft/common/networking/PacketBattleMessage.java b/src/main/java/com/seodisparate/TurnBasedMinecraft/common/networking/PacketBattleMessage.java
index d3898c9..e15b931 100644
--- a/src/main/java/com/seodisparate/TurnBasedMinecraft/common/networking/PacketBattleMessage.java
+++ b/src/main/java/com/seodisparate/TurnBasedMinecraft/common/networking/PacketBattleMessage.java
@@ -327,12 +327,12 @@ public class PacketBattleMessage implements IMessage
                 if(message.amount != 0)
                 {
                     Minecraft.getMinecraft().ingameGUI.getChatGUI().printChatMessage(new TextComponentString(
-                            to + " switched to a different item!"));
+                            from + " switched to a different item!"));
                 }
                 else
                 {
                     Minecraft.getMinecraft().ingameGUI.getChatGUI().printChatMessage(new TextComponentString(
-                            to + " switched to a different item but failed because it was invalid!"));
+                            from + " switched to a different item but failed because it was invalid!"));
                 }
                 break;
             case WAS_AFFECTED:
diff --git a/src/main/resources/assets/TurnBasedMinecraft/TBM_Config.xml b/src/main/resources/assets/TurnBasedMinecraft/TBM_Config.xml
index 39d328b..b5f3db3 100644
--- a/src/main/resources/assets/TurnBasedMinecraft/TBM_Config.xml
+++ b/src/main/resources/assets/TurnBasedMinecraft/TBM_Config.xml
@@ -1,6 +1,6 @@
 <TurnBasedMinecraftConfig>
 	<!-- If the mod has a newer version config, it will rename the existing config and place the new config -->
-	<Version>1</Version>
+	<Version>2</Version>
 	<!-- Types that will not initiate battle with player. They are listed as "Category" per EntiytStats entity.
 		 Note that items listed in "IgnoreBattleTypes" and "Category" are converted to lowercase before being compared. -->
 	<IgnoreBattleTypes>
@@ -19,6 +19,8 @@
 	<!-- Probability of escaping battle. If entity's speed is greater than the enemy team's speediest entity, then good probability is used. -->
 	<FleeGoodProbability>90</FleeGoodProbability>
 	<FleeBadProbability>40</FleeBadProbability>
+	<!-- Minimum hit percentage for every entity. If less than 1, it will be stored as 1 anyways. -->
+	<MinimumHitPercentage>4</MinimumHitPercentage>
 	<!-- Battle stats for entities should be specified here. If an entity is not listed it cannot enter battle. -->
 	<EntityStats>
 		<!-- AttackPower: How much damage an entity does per attack. Usually has a "Probability" attribute between 0 and 100. Also may have a "Variance" attribute that varies the attack power by the specified amount randomly. -->