diff --git a/src/com/projectkorra/ProjectKorra/Ability/AvatarState.java b/src/com/projectkorra/ProjectKorra/Ability/AvatarState.java
index f667e250..aa05d1e9 100644
--- a/src/com/projectkorra/ProjectKorra/Ability/AvatarState.java
+++ b/src/com/projectkorra/ProjectKorra/Ability/AvatarState.java
@@ -79,10 +79,12 @@ public class AvatarState {
 		}
 		if (!GeneralMethods.canBend(player.getName(), StockAbilities.AvatarState.name())) {
 			instances.remove(player);
-			if(GeneralMethods.getBendingPlayer(player.getName()).isOnCooldown("AvatarState")) {
-				GeneralMethods.getBendingPlayer(player.getName()).removeCooldown("AvatarState");
-			}
+			if(player != null){
+				if(GeneralMethods.getBendingPlayer(player.getName()).isOnCooldown("AvatarState")) {
+					GeneralMethods.getBendingPlayer(player.getName()).removeCooldown("AvatarState");
+				}
 			return false;
+			}
 		}
 		
 		if (startTimes.containsKey(player.getName())) {
diff --git a/src/com/projectkorra/ProjectKorra/configuration/ConfigManager.java b/src/com/projectkorra/ProjectKorra/configuration/ConfigManager.java
index 86a60950..eb2708ce 100644
--- a/src/com/projectkorra/ProjectKorra/configuration/ConfigManager.java
+++ b/src/com/projectkorra/ProjectKorra/configuration/ConfigManager.java
@@ -504,7 +504,7 @@ public class ConfigManager {
 			config.addDefault("Abilities.Water.WaterSpout.Wave.ChargeTime", 1000);
 			config.addDefault("Abilities.Water.WaterSpout.Wave.FlightTime", 2000);
 			config.addDefault("Abilities.Water.WaterSpout.Wave.Speed", 1.2);
-			config.addDefault("Abilities.Water.WaterSpout.Wave.Cooldown", 2000);
+			config.addDefault("Abilities.Water.WaterSpout.Wave.Cooldown", 6000);
 			
 			config.addDefault("Abilities.Water.WaterCombo.Enabled", true);
 			config.addDefault("Abilities.Water.WaterCombo.IceWave.Damage", 3);
@@ -845,6 +845,9 @@ public class ConfigManager {
 			config.addDefault("Abilities.Chi.Passive.Jump", 2);
 			config.addDefault("Abilities.Chi.Passive.BlockChi.Duration", 2500);
 			config.addDefault("Abilities.Chi.Passive.DodgeChange", 25);
+
+			config.addDefault("Abilities.Chi.ChiCombo.ParalyzeDuration", 10000);
+			config.addDefault("Abilities.Chi.ChiCombo.Cooldown", 20000);
 			      
 			config.addDefault("Abilities.Chi.AcrobatStance.Enabled", true);
 			config.addDefault("Abilities.Chi.AcrobatStance.Description", "AcrobatStance gives a Chiblocker a higher probability of blocking a Bender's Chi while granting them a Speed and Jump Boost. It also increases the rate at which the hunger bar depletes. To use, simply left click. Left clicking again will de-activate the stance.");
@@ -889,9 +892,6 @@ public class ConfigManager {
 			config.addDefault("Abilities.Chi.SwiftKick.Damage", 4);
 			config.addDefault("Abilities.Chi.SwiftKick.ChiBlockChance", 30);
 			
-			config.addDefault("Abilities.Chi.ChiCombo.ParalyzeDuration", 10000);
-			config.addDefault("Abilities.Chi.ChiCombo.Cooldown", 20000);
-			
 			config.addDefault("Storage.engine", "sqlite");
 
 			config.addDefault("Storage.MySQL.host", "localhost");
diff --git a/src/com/projectkorra/ProjectKorra/waterbending/WaterWave.java b/src/com/projectkorra/ProjectKorra/waterbending/WaterWave.java
index e302e210..80c030a4 100644
--- a/src/com/projectkorra/ProjectKorra/waterbending/WaterWave.java
+++ b/src/com/projectkorra/ProjectKorra/waterbending/WaterWave.java
@@ -73,7 +73,7 @@ public class WaterWave {
 	private ArrayList<BukkitRunnable> tasks = new ArrayList<BukkitRunnable>();
 
 	public WaterWave(Player player, AbilityType type) {
-		if (!ENABLED || GeneralMethods.getBendingPlayer(player.getName()).isOnCooldown("WaterSpout"))
+		if (!ENABLED || GeneralMethods.getBendingPlayer(player.getName()).isOnCooldown("WaterWave"))
 			return;
 
 		this.player = player;
@@ -305,7 +305,7 @@ public class WaterWave {
 
 	public void remove() {
 		instances.remove(this);
-		GeneralMethods.getBendingPlayer(player.getName()).addCooldown("WaterSpout", cooldown);
+		GeneralMethods.getBendingPlayer(player.getName()).addCooldown("WaterWave", cooldown);
 		revertBlocks();
 		for (BukkitRunnable task : tasks)
 			task.cancel();
diff --git a/src/config.yml b/src/config.yml
index ac75d4ad..c604f05e 100644
--- a/src/config.yml
+++ b/src/config.yml
@@ -307,6 +307,7 @@ Abilities:
         ChargeTime: 1000
         FlightTime: 2000
         Speed: 1.2
+        Cooldown: 6000
     WaterCombo:
       Enabled: true
       IceWave:
@@ -542,12 +543,14 @@ Abilities:
       Damage: 2
       Cooldown: 1500
       Dissipate: false
+      FireTicks: 6
       Charged:
         ChargeTime: 2000
         Damage: 4
         DamageRadius: 6
         Power: 1
         Range: 20
+        FireTicks: 6
     FireBurst:
       Enabled: true
       Description: "FireBurst is a very powerful firebending ability. To use, press and hold sneak to charge your burst. Once charged, you can either release sneak to launch a cone-shaped burst of flames in front of you, or click to release the burst in a sphere around you."
@@ -567,6 +570,7 @@ Abilities:
       Radius: 3
       DiscRadius: 1.5
       Duration: 1000
+      FireTicks: 6
     HeatControl:
       Enabled: true
       Description: "While this ability is selected, the firebender becomes impervious to fire damage and cannot be ignited. If the user left-clicks with this ability, the targeted area will be extinguished, although it will leave any creature burning engulfed in flames. This ability can also cool lava. If this ability is used while targeting ice or snow, it will instead melt blocks in that area. Finally, sneaking with this ability will cook any food in your hand."
@@ -609,6 +613,7 @@ Abilities:
       Damage: 2
       Cooldown: 7500
       Interval: 500
+      FireTicks: 3
     FireCombo:
       Enabled: true
       FireKick:
@@ -625,13 +630,16 @@ Abilities:
         Damage: 4.0
         Speed: 0.55
         Cooldown: 200
+        FireTicks: 2.5
       JetBlast:
         Speed: 1.2
         Cooldown: 6000
+        FireTicks: 2.5
       JetBlaze:
         Speed: 1.1
         Damage: 3
         Cooldown: 6000
+        FireTicks: 2.5
   Chi:
     Passive:
       FallReductionFactor: 0.5
@@ -640,6 +648,9 @@ Abilities:
       BlockChi:
         Duration: 2500
         DodgeChance: 25
+    ChiCombo:
+      ParalyzeDuration: 10000
+      Cooldown: 20000
     AcrobatStance:
       Enabled: true
       Description: "AcrobatStance gives a Chiblocker a higher probability of blocking a Bender's Chi while granting them a Speed and Jump boost. It also increases the rate at which the hunger bar depletes. To use, simply left click. Left clicking again will de-activate the stance."