diff --git a/.classpath b/.classpath
index c600c3be..77c2802b 100644
--- a/.classpath
+++ b/.classpath
@@ -8,5 +8,6 @@
 	<classpathentry kind="lib" path="C:/Users/Shawn/Documents/LocalServer/plugins/ProjectKorra/Abilities/WaterManipulation.jar"/>
 	<classpathentry kind="lib" path="C:/Users/Shawn/Documents/LocalServer/plugins/ProjectKorra/Abilities/OctopusForm.jar"/>
 	<classpathentry kind="lib" path="C:/Users/Shawn/Documents/LocalServer/plugins/ProjectKorra/Abilities/PhaseChange.jar"/>
+	<classpathentry kind="lib" path="C:/Users/Shawn/Documents/LocalServer/plugins/ProjectKorra/Abilities/Surge.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/src/com/projectkorra/ProjectKorra/ConfigManager.java b/src/com/projectkorra/ProjectKorra/ConfigManager.java
index 511eb262..53490b8b 100644
--- a/src/com/projectkorra/ProjectKorra/ConfigManager.java
+++ b/src/com/projectkorra/ProjectKorra/ConfigManager.java
@@ -29,6 +29,7 @@ public class ConfigManager {
 		earthbendable.add("SANDSTONE");
 		
 		plugin.getConfig().addDefault("Properties.GlobalCooldown", 500);
+		plugin.getConfig().addDefault("Properties.SeaLevel", 62);
 		
 		plugin.getConfig().addDefault("Properties.Air.CanBendWithWeapons", false);
 		
diff --git a/src/com/projectkorra/ProjectKorra/waterbending/WaterReturn.java b/src/com/projectkorra/ProjectKorra/waterbending/WaterReturn.java
index 146b7685..118cb1b4 100644
--- a/src/com/projectkorra/ProjectKorra/waterbending/WaterReturn.java
+++ b/src/com/projectkorra/ProjectKorra/waterbending/WaterReturn.java
@@ -14,6 +14,8 @@ import org.bukkit.util.Vector;
 import com.projectkorra.ProjectKorra.Methods;
 import com.projectkorra.ProjectKorra.TempBlock;
 import com.projectkorra.abilities.OctopusForm.OctopusFormAbility;
+import com.projectkorra.abilities.Surge.WaterWall;
+import com.projectkorra.abilities.Surge.Wave;
 import com.projectkorra.abilities.WaterManipulation.WaterManipulationAbility;
 
 public class WaterReturn {
@@ -155,7 +157,8 @@ public class WaterReturn {
 	private static boolean isBending(Player player) {
 		if (Methods.isAbilityInstalled("WaterManipulation", "orion304")) {
 			for (int id : WaterManipulationAbility .instances.keySet()) {
-				if (WaterManipulationAbility.instances.get(id).player.equals(player))
+				WaterManipulationAbility.instances.get(id);
+				if (WaterManipulationAbility.player.equals(player))
 					return true;
 			}
 		}
diff --git a/src/config.yml b/src/config.yml
index 1a091b57..85caf24f 100644
--- a/src/config.yml
+++ b/src/config.yml
@@ -1,5 +1,6 @@
 Properties:
   GlobalCooldown: 500
+  SeaLevel: 62
   Chat:
     ChatPrefixes: true
     AirPrefix: "[&7Air&f]"