diff --git a/src/com/projectkorra/projectkorra/airbending/AirSwipe.java b/src/com/projectkorra/projectkorra/airbending/AirSwipe.java
index c686e10b..e497657b 100644
--- a/src/com/projectkorra/projectkorra/airbending/AirSwipe.java
+++ b/src/com/projectkorra/projectkorra/airbending/AirSwipe.java
@@ -84,7 +84,6 @@ public class AirSwipe extends AirAbility {
 			launch();
 		}
 		start();
-		bPlayer.addCooldown(this);
 	}
 
 	public static boolean removeSwipesAroundPoint(Location loc, double radius) {
@@ -228,6 +227,7 @@ public class AirSwipe extends AirAbility {
 	}
 
 	private void launch() {
+		bPlayer.addCooldown("AirSwipe", cooldown);
 		origin = player.getEyeLocation();
 		for (double i = -arc; i <= arc; i += stepSize) {
 			double angle = Math.toRadians((double) i);
diff --git a/src/com/projectkorra/projectkorra/firebending/FireCombo.java b/src/com/projectkorra/projectkorra/firebending/FireCombo.java
index 3f49b0b5..8c1ea6b9 100644
--- a/src/com/projectkorra/projectkorra/firebending/FireCombo.java
+++ b/src/com/projectkorra/projectkorra/firebending/FireCombo.java
@@ -195,12 +195,14 @@ public class FireCombo extends FireAbility implements ComboAbility {
 				affectedEntities.add(entity);
 				GeneralMethods.damageEntity(this, entity, damage);
 				entity.setFireTicks((int) (fireTicks * 20));
+				new FireDamageTimer(entity, player);
 			}
 		} else if (ability.equalsIgnoreCase("FireWheel")) {
 			if (!affectedEntities.contains(entity)) {
 				affectedEntities.add(entity);
 				GeneralMethods.damageEntity(this, entity, damage);
 				entity.setFireTicks((int) (fireTicks * 20));
+				new FireDamageTimer(entity, player);
 				this.remove();
 			}
 		}
diff --git a/src/com/projectkorra/projectkorra/waterbending/WaterSpout.java b/src/com/projectkorra/projectkorra/waterbending/WaterSpout.java
index 15a2b879..89a7f07d 100644
--- a/src/com/projectkorra/projectkorra/waterbending/WaterSpout.java
+++ b/src/com/projectkorra/projectkorra/waterbending/WaterSpout.java
@@ -258,7 +258,8 @@ public class WaterSpout extends WaterAbility {
 		for (WaterSpout spout : getAbilities(sourcePlayer, WaterSpout.class)) {
 			Location top = spout.getLocation();
 			Location base = spout.getBase().getLocation();
-			for (double d = base.getY(); d <= top.getBlockY(); d += 0.25) {
+			double dist = top.getBlockY() - base.getBlockY();
+			for (double d = 0; d <= dist; d += 0.25) {
 				Location spoutl = base.clone().add(0, d, 0);
 				if (loc0.distance(spoutl) <= radius) {
 					removed = true;