diff --git a/src/com/projectkorra/ProjectKorra/BendingManager.java b/src/com/projectkorra/ProjectKorra/BendingManager.java
index f9301979..1c1c1a4d 100644
--- a/src/com/projectkorra/ProjectKorra/BendingManager.java
+++ b/src/com/projectkorra/ProjectKorra/BendingManager.java
@@ -92,8 +92,10 @@ public class BendingManager implements Runnable {
 			TempPotionEffect.progressAll();
 			handleDayNight();
 			Flight.handle();	
-			for (Player p : RapidPunch.instance.keySet())
-				RapidPunch.instance.get(p).startPunch(p);
+			for (Player p : RapidPunch.instances.keySet()) {
+				if (p == null) continue;
+				RapidPunch.instances.get(p).startPunch(p);
+			}
 			for (int i : RevertChecker.airRevertQueue.keySet()) {
 				Methods.revertAirBlock(i);
 				RevertChecker.airRevertQueue.remove(i);
diff --git a/src/com/projectkorra/ProjectKorra/Methods.java b/src/com/projectkorra/ProjectKorra/Methods.java
index 1c69746d..ef6ac1a0 100644
--- a/src/com/projectkorra/ProjectKorra/Methods.java
+++ b/src/com/projectkorra/ProjectKorra/Methods.java
@@ -1778,7 +1778,7 @@ public class Methods {
 		Cook.removeAll();
 		Illumination.removeAll();
 
-		RapidPunch.instance.clear();
+		RapidPunch.instances.clear();
 
 		Flight.removeAll();
 		WaterReturn.removeAll();
diff --git a/src/com/projectkorra/ProjectKorra/PKListener.java b/src/com/projectkorra/ProjectKorra/PKListener.java
index f3528c74..fee2041f 100644
--- a/src/com/projectkorra/ProjectKorra/PKListener.java
+++ b/src/com/projectkorra/ProjectKorra/PKListener.java
@@ -295,8 +295,7 @@ public class PKListener implements Listener {
 		BendingPlayer.players.remove(event.getPlayer().getName());
 		if (EarthArmor.instances.containsKey(event.getPlayer())) {
 			EarthArmor.removeEffect(event.getPlayer());
-			event.getPlayer().removePotionEffect(
-					PotionEffectType.DAMAGE_RESISTANCE);
+			event.getPlayer().removePotionEffect(PotionEffectType.DAMAGE_RESISTANCE);
 		}
 	}
 
diff --git a/src/com/projectkorra/ProjectKorra/TagAPIListener.java b/src/com/projectkorra/ProjectKorra/TagAPIListener.java
index ed00bb77..12eac64e 100644
--- a/src/com/projectkorra/ProjectKorra/TagAPIListener.java
+++ b/src/com/projectkorra/ProjectKorra/TagAPIListener.java
@@ -19,7 +19,7 @@ public class TagAPIListener implements Listener {
 	public void onNameTag(AsyncPlayerReceiveNameTagEvent e) {
 		List<Element> elements = Methods.getBendingPlayer(e.getNamedPlayer().getName()).getElements();
 		if (elements!=null && plugin.getConfig().getBoolean("Properties.TagAPI.Enabled")) {
-			if (elements.size() > 1)
+			if (elements.size() < 1)
 				e.setTag(ChatColor.LIGHT_PURPLE + e.getNamedPlayer().getName());
 			else if (elements.get(0).equals(Element.Earth))
 				e.setTag(ChatColor.GREEN + e.getNamedPlayer().getName());
diff --git a/src/com/projectkorra/ProjectKorra/chiblocking/RapidPunch.java b/src/com/projectkorra/ProjectKorra/chiblocking/RapidPunch.java
index d7891d5a..455d9e5c 100644
--- a/src/com/projectkorra/ProjectKorra/chiblocking/RapidPunch.java
+++ b/src/com/projectkorra/ProjectKorra/chiblocking/RapidPunch.java
@@ -15,7 +15,7 @@ import com.projectkorra.ProjectKorra.ProjectKorra;
 
 public class RapidPunch {
 
-	public static ConcurrentHashMap<Player, RapidPunch> instance = new ConcurrentHashMap<Player, RapidPunch>();
+	public static ConcurrentHashMap<Player, RapidPunch> instances = new ConcurrentHashMap<Player, RapidPunch>();
 	public static List<Player> punching = new ArrayList<Player>();
 	private static Map<String, Long> cooldowns = new HashMap<String, Long>();
 	
@@ -29,7 +29,7 @@ public class RapidPunch {
 	private Entity target;
 
 	public RapidPunch(Player p) {// , Entity t) {
-		if (instance.containsKey(p))
+		if (instances.containsKey(p))
 			return;
 		if (cooldowns.containsKey(p.getName())) {
 			if (cooldowns.get(p.getName()) + cooldown >= System.currentTimeMillis()) {
@@ -46,12 +46,12 @@ public class RapidPunch {
 
 		target = t;
 		numpunches = 0;
-		instance.put(p, this);
+		instances.put(p, this);
 	}
 
 	public void startPunch(Player p) {
 		if (numpunches >= punches)
-			instance.remove(p);
+			instances.remove(p);
 		if (target instanceof LivingEntity && target != null) {
 			LivingEntity lt = (LivingEntity) target;
 			Methods.damageEntity(p, target, damage);