diff --git a/pom.xml b/pom.xml
index fe86d5f..a3dec25 100644
--- a/pom.xml
+++ b/pom.xml
@@ -58,7 +58,7 @@
         <dependency>
                 <groupId>org.bukkit</groupId>
                 <artifactId>bukkit</artifactId>
-                <version>1.10.2-R0.1-SNAPSHOT</version>
+                <version>1.11-R0.1-SNAPSHOT</version>
                 <scope>provided</scope>
         </dependency>
          <!--Worldguard dependency-->
diff --git a/src/me/ryanhamshire/GriefPrevention/EntityEventHandler.java b/src/me/ryanhamshire/GriefPrevention/EntityEventHandler.java
index 9553d41..db6dd42 100644
--- a/src/me/ryanhamshire/GriefPrevention/EntityEventHandler.java
+++ b/src/me/ryanhamshire/GriefPrevention/EntityEventHandler.java
@@ -980,6 +980,7 @@ public class EntityEventHandler implements Listener
                 {
                     //if damaged by anything other than a player (exception villagers injured by zombies in admin claims), cancel the event
                     //why exception?  so admins can set up a village which can't be CHANGED by players, but must be "protected" by players.
+					//TODO: Discuss if this should only apply to admin claims...?
                     if(attacker == null)
                     {
                         //exception case
diff --git a/src/me/ryanhamshire/GriefPrevention/PlayerEventHandler.java b/src/me/ryanhamshire/GriefPrevention/PlayerEventHandler.java
index f39cf47..9236f40 100644
--- a/src/me/ryanhamshire/GriefPrevention/PlayerEventHandler.java
+++ b/src/me/ryanhamshire/GriefPrevention/PlayerEventHandler.java
@@ -1150,7 +1150,7 @@ class PlayerEventHandler implements Listener
                    }
                 }
             }
-            else  //world repair code for a now-fixed GP bug
+            else  //world repair code for a now-fixed GP bug //TODO: necessary anymore?
             {
                 //ensure this entity can be tamed by players
                 tameable.setOwner(null);