diff --git a/main/src/main/java/me/blackvein/quests/CustomObjective.java b/main/src/main/java/me/blackvein/quests/CustomObjective.java
index c847157e4..b9f8cd019 100644
--- a/main/src/main/java/me/blackvein/quests/CustomObjective.java
+++ b/main/src/main/java/me/blackvein/quests/CustomObjective.java
@@ -1,5 +1,5 @@
 /*******************************************************************************************************
- * Continued by PikaMug (formerly HappyPikachu) with permission from _Blackvein_. All rights reserved.
+ * Copyright (c) 2014 PikaMug and contributors. All rights reserved.
  * 
  * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
diff --git a/main/src/main/java/me/blackvein/quests/CustomRequirement.java b/main/src/main/java/me/blackvein/quests/CustomRequirement.java
index 9b3757c57..cd108dde2 100644
--- a/main/src/main/java/me/blackvein/quests/CustomRequirement.java
+++ b/main/src/main/java/me/blackvein/quests/CustomRequirement.java
@@ -1,5 +1,5 @@
 /*******************************************************************************************************
- * Continued by PikaMug (formerly HappyPikachu) with permission from _Blackvein_. All rights reserved.
+ * Copyright (c) 2014 PikaMug and contributors. All rights reserved.
  * 
  * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
diff --git a/main/src/main/java/me/blackvein/quests/CustomReward.java b/main/src/main/java/me/blackvein/quests/CustomReward.java
index 62b92814c..ac3329e88 100644
--- a/main/src/main/java/me/blackvein/quests/CustomReward.java
+++ b/main/src/main/java/me/blackvein/quests/CustomReward.java
@@ -1,5 +1,5 @@
 /*******************************************************************************************************
- * Continued by PikaMug (formerly HappyPikachu) with permission from _Blackvein_. All rights reserved.
+ * Copyright (c) 2014 PikaMug and contributors. All rights reserved.
  * 
  * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
diff --git a/main/src/main/java/me/blackvein/quests/DenizenTrigger.java b/main/src/main/java/me/blackvein/quests/DenizenTrigger.java
index 64bea68e8..e1e5c6c96 100644
--- a/main/src/main/java/me/blackvein/quests/DenizenTrigger.java
+++ b/main/src/main/java/me/blackvein/quests/DenizenTrigger.java
@@ -1,5 +1,5 @@
 /*******************************************************************************************************
- * Continued by PikaMug (formerly HappyPikachu) with permission from _Blackvein_. All rights reserved.
+ * Copyright (c) 2014 PikaMug and contributors. All rights reserved.
  * 
  * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
diff --git a/main/src/main/java/me/blackvein/quests/Dependencies.java b/main/src/main/java/me/blackvein/quests/Dependencies.java
index 9d3d94e82..1cc62a80a 100644
--- a/main/src/main/java/me/blackvein/quests/Dependencies.java
+++ b/main/src/main/java/me/blackvein/quests/Dependencies.java
@@ -1,5 +1,5 @@
 /*******************************************************************************************************
- * Continued by PikaMug (formerly HappyPikachu) with permission from _Blackvein_. All rights reserved.
+ * Copyright (c) 2014 PikaMug and contributors. All rights reserved.
  * 
  * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
diff --git a/main/src/main/java/me/blackvein/quests/Objective.java b/main/src/main/java/me/blackvein/quests/Objective.java
index 5c28a2371..d9704c97a 100644
--- a/main/src/main/java/me/blackvein/quests/Objective.java
+++ b/main/src/main/java/me/blackvein/quests/Objective.java
@@ -1,5 +1,5 @@
 /*******************************************************************************************************
- * Continued by PikaMug (formerly HappyPikachu) with permission from _Blackvein_. All rights reserved.
+ * Copyright (c) 2014 PikaMug and contributors. All rights reserved.
  * 
  * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
diff --git a/main/src/main/java/me/blackvein/quests/Options.java b/main/src/main/java/me/blackvein/quests/Options.java
index 93065b28c..349f7d494 100644
--- a/main/src/main/java/me/blackvein/quests/Options.java
+++ b/main/src/main/java/me/blackvein/quests/Options.java
@@ -1,5 +1,5 @@
 /*******************************************************************************************************
- * Continued by PikaMug (formerly HappyPikachu) with permission from _Blackvein_. All rights reserved.
+ * Copyright (c) 2014 PikaMug and contributors. All rights reserved.
  * 
  * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
@@ -18,8 +18,8 @@ public class Options {
     private boolean ignoreSilkTouch = true;
     private boolean useDungeonsXLPlugin = false;
     private boolean usePartiesPlugin = true;
-    private boolean partiesHandleOfflinePlayers = false;
-    private long partiesDistance = 0;
+    private boolean handleOfflinePlayers = false;
+    private double shareDistance = 0.0D;
     private int shareProgressLevel = 1;
     private boolean shareSameQuestOnly = true;
     
@@ -63,22 +63,6 @@ public class Options {
         this.usePartiesPlugin = usePartiesPlugin;
     }
     
-    public boolean canPartiesHandleOfflinePlayers() {
-        return partiesHandleOfflinePlayers;
-    }
-    
-    public void setPartiesHandleOfflinePlayers(final boolean partiesHandleOfflinePlayers) {
-        this.partiesHandleOfflinePlayers = partiesHandleOfflinePlayers;
-    }
-    
-    public long getPartiesDistance() {
-        return partiesDistance;
-    }
-    
-    public void setPartiesDistance(final long partiesDistance) {
-        this.partiesDistance = partiesDistance;
-    }
-    
     public int getShareProgressLevel() {
         return shareProgressLevel;
     }
@@ -94,4 +78,20 @@ public class Options {
     public void setShareSameQuestOnly(final boolean shareSameQuestOnly) {
         this.shareSameQuestOnly = shareSameQuestOnly;
     }
+    
+    public double getShareDistance() {
+        return shareDistance;
+    }
+    
+    public void setShareDistance(final double shareDistance) {
+        this.shareDistance = shareDistance;
+    }
+    
+    public boolean canHandleOfflinePlayers() {
+        return handleOfflinePlayers;
+    }
+    
+    public void setHandleOfflinePlayers(final boolean handleOfflinePlayers) {
+        this.handleOfflinePlayers = handleOfflinePlayers;
+    }
 }
diff --git a/main/src/main/java/me/blackvein/quests/Planner.java b/main/src/main/java/me/blackvein/quests/Planner.java
index e60341407..e71c6b16d 100644
--- a/main/src/main/java/me/blackvein/quests/Planner.java
+++ b/main/src/main/java/me/blackvein/quests/Planner.java
@@ -1,5 +1,5 @@
 /*******************************************************************************************************
- * Continued by PikaMug (formerly HappyPikachu) with permission from _Blackvein_. All rights reserved.
+ * Copyright (c) 2014 PikaMug and contributors. All rights reserved.
  * 
  * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
diff --git a/main/src/main/java/me/blackvein/quests/Quest.java b/main/src/main/java/me/blackvein/quests/Quest.java
index 76298c502..bbbbe2860 100644
--- a/main/src/main/java/me/blackvein/quests/Quest.java
+++ b/main/src/main/java/me/blackvein/quests/Quest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************************************
- * Continued by PikaMug (formerly HappyPikachu) with permission from _Blackvein_. All rights reserved.
+ * Copyright (c) 2014 PikaMug and contributors. All rights reserved.
  * 
  * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
diff --git a/main/src/main/java/me/blackvein/quests/QuestData.java b/main/src/main/java/me/blackvein/quests/QuestData.java
index b45c97960..4934f857f 100644
--- a/main/src/main/java/me/blackvein/quests/QuestData.java
+++ b/main/src/main/java/me/blackvein/quests/QuestData.java
@@ -1,5 +1,5 @@
 /*******************************************************************************************************
- * Continued by PikaMug (formerly HappyPikachu) with permission from _Blackvein_. All rights reserved.
+ * Copyright (c) 2014 PikaMug and contributors. All rights reserved.
  * 
  * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
diff --git a/main/src/main/java/me/blackvein/quests/QuestFactory.java b/main/src/main/java/me/blackvein/quests/QuestFactory.java
index cf97458b8..fefcfdeaa 100644
--- a/main/src/main/java/me/blackvein/quests/QuestFactory.java
+++ b/main/src/main/java/me/blackvein/quests/QuestFactory.java
@@ -1,5 +1,5 @@
 /*******************************************************************************************************
- * Continued by PikaMug (formerly HappyPikachu) with permission from _Blackvein_. All rights reserved.
+ * Copyright (c) 2014 PikaMug and contributors. All rights reserved.
  * 
  * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
@@ -285,7 +285,7 @@ public class QuestFactory implements ConversationAbandonedListener {
         context.setSessionData(CK.OPT_USE_DUNGEONSXL_PLUGIN, opt.canUseDungeonsXLPlugin());
         context.setSessionData(CK.OPT_USE_PARTIES_PLUGIN, opt.canUsePartiesPlugin());
         context.setSessionData(CK.OPT_SHARE_PROGRESS_LEVEL, opt.getShareProgressLevel());
-        context.setSessionData(CK.OPT_SAME_QUEST_ONLY, opt.canShareSameQuestOnly());
+        context.setSessionData(CK.OPT_SHARE_SAME_QUEST_ONLY, opt.canShareSameQuestOnly());
         // Stages (Objectives)
         int index = 1;
         for (final Stage stage : q.getStages()) {
@@ -949,8 +949,12 @@ public class QuestFactory implements ConversationAbandonedListener {
                 ? (Boolean) context.getSessionData(CK.OPT_USE_PARTIES_PLUGIN) : null);
         opts.set("share-progress-level", context.getSessionData(CK.OPT_SHARE_PROGRESS_LEVEL) != null 
                 ? (Integer) context.getSessionData(CK.OPT_SHARE_PROGRESS_LEVEL) : null);
-        opts.set("same-quest-only", context.getSessionData(CK.OPT_SAME_QUEST_ONLY) != null
-                ? (Boolean) context.getSessionData(CK.OPT_SAME_QUEST_ONLY) : null);
+        opts.set("same-quest-only", context.getSessionData(CK.OPT_SHARE_SAME_QUEST_ONLY) != null
+                ? (Boolean) context.getSessionData(CK.OPT_SHARE_SAME_QUEST_ONLY) : null);
+        opts.set("share-distance", context.getSessionData(CK.OPT_SHARE_DISTANCE) != null
+                ? (Double) context.getSessionData(CK.OPT_SHARE_DISTANCE) : null);
+        opts.set("handle-offline-players", context.getSessionData(CK.OPT_HANDLE_OFFLINE_PLAYERS) != null
+                ? (Boolean) context.getSessionData(CK.OPT_HANDLE_OFFLINE_PLAYERS) : null);
         if (opts.getKeys(false).isEmpty()) {
             section.set("options", null);
         }
diff --git a/main/src/main/java/me/blackvein/quests/QuestMob.java b/main/src/main/java/me/blackvein/quests/QuestMob.java
index 119ffce21..c3ab961a1 100644
--- a/main/src/main/java/me/blackvein/quests/QuestMob.java
+++ b/main/src/main/java/me/blackvein/quests/QuestMob.java
@@ -1,5 +1,5 @@
 /*******************************************************************************************************
- * Continued by PikaMug (formerly HappyPikachu) with permission from _Blackvein_. All rights reserved.
+ * Copyright (c) 2014 PikaMug and contributors. All rights reserved.
  * 
  * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
diff --git a/main/src/main/java/me/blackvein/quests/Quester.java b/main/src/main/java/me/blackvein/quests/Quester.java
index 2fb99a053..3feedea79 100644
--- a/main/src/main/java/me/blackvein/quests/Quester.java
+++ b/main/src/main/java/me/blackvein/quests/Quester.java
@@ -1,5 +1,5 @@
 /*******************************************************************************************************
- * Continued by PikaMug (formerly HappyPikachu) with permission from _Blackvein_. All rights reserved.
+ * Copyright (c) 2014 PikaMug and contributors. All rights reserved.
  * 
  * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
@@ -4111,8 +4111,9 @@ public class Quester implements Comparable<Quester> {
                 if (partyPlayer != null && partyPlayer.getPartyId() != null) {
                     final Party party = plugin.getDependencies().getPartiesApi().getParty(partyPlayer.getPartyId());
                     if (party != null) {
-                        final long distanceSquared = quest.getOptions().getPartiesDistance() * quest.getOptions().getPartiesDistance();
-                        final boolean offlinePlayers = quest.getOptions().canPartiesHandleOfflinePlayers();
+                        final double distanceSquared = quest.getOptions().getShareDistance() 
+                                * quest.getOptions().getShareDistance();
+                        final boolean offlinePlayers = quest.getOptions().canHandleOfflinePlayers();
                         if (offlinePlayers) {
                             for (final UUID id : party.getMembers()) {
                                 if (!id.equals(getUUID())) {
@@ -4124,11 +4125,13 @@ public class Quester implements Comparable<Quester> {
                                 if (!pp.getPlayerUUID().equals(getUUID())) {
                                     if (distanceSquared > 0) {
                                         final Player player = Bukkit.getPlayer(pp.getPlayerUUID());
-                                        if (player != null && distanceSquared >= getPlayer().getLocation().distanceSquared(player.getLocation())) {
+                                        if (player != null && distanceSquared >= getPlayer().getLocation()
+                                                .distanceSquared(player.getLocation())) {
                                             mq.add(plugin.getQuester(pp.getPlayerUUID()));
                                         }
-                                    } else
+                                    } else {
                                         mq.add(plugin.getQuester(pp.getPlayerUUID()));
+                                    }
                                 }
                             }
                         }
@@ -4142,9 +4145,28 @@ public class Quester implements Comparable<Quester> {
             if (quest.getOptions().canUseDungeonsXLPlugin()) {
                 final DGroup group = (DGroup) plugin.getDependencies().getDungeonsApi().getPlayerGroup(getPlayer());
                 if (group != null) {
-                    for (final UUID id : group.getMembers()) {
-                        if (!id.equals(getUUID())) {
-                            mq.add(plugin.getQuester(id));
+                    final double distanceSquared = quest.getOptions().getShareDistance() 
+                            * quest.getOptions().getShareDistance();
+                    final boolean offlinePlayers = quest.getOptions().canHandleOfflinePlayers();
+                    if (offlinePlayers) {
+                        for (final UUID id : group.getMembers()) {
+                            if (!id.equals(getUUID())) {
+                                mq.add(plugin.getQuester(id));
+                            }
+                        }
+                    } else {
+                        for (final UUID id : group.getMembers()) {
+                            if (!id.equals(getUUID())) {
+                                if (distanceSquared > 0) {
+                                    final Player player = Bukkit.getPlayer(id);
+                                    if (player != null && distanceSquared >= getPlayer().getLocation()
+                                            .distanceSquared(player.getLocation())) {
+                                        mq.add(plugin.getQuester(id));
+                                    }
+                                } else {
+                                    mq.add(plugin.getQuester(id));
+                                }
+                            }
                         }
                     }
                     return mq;
diff --git a/main/src/main/java/me/blackvein/quests/Quests.java b/main/src/main/java/me/blackvein/quests/Quests.java
index 1776406e3..fa2400c7e 100644
--- a/main/src/main/java/me/blackvein/quests/Quests.java
+++ b/main/src/main/java/me/blackvein/quests/Quests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************************************
- * Continued by PikaMug (formerly HappyPikachu) with permission from _Blackvein_. All rights reserved.
+ * Copyright (c) 2014 PikaMug and contributors. All rights reserved.
  * 
  * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
@@ -2174,18 +2174,18 @@ public class Quests extends JavaPlugin implements ConversationAbandonedListener
         if (config.contains("quests." + questKey + ".options.use-parties-plugin")) {
             opts.setUsePartiesPlugin(config.getBoolean("quests." + questKey + ".options.use-parties-plugin"));
         }
-        if (config.contains("quests." + questKey + ".options.parties.handle-offline-players")) {
-            opts.setPartiesHandleOfflinePlayers(config.getBoolean("quests." + questKey + ".options.parties.handle-offline-players"));
-        }
-        if (config.contains("quests." + questKey + ".options.parties.distance")) {
-            opts.setPartiesDistance(config.getLong("quests." + questKey + ".options.parties.distance"));
-        }
         if (config.contains("quests." + questKey + ".options.share-progress-level")) {
             opts.setShareProgressLevel(config.getInt("quests." + questKey + ".options.share-progress-level"));
         }
         if (config.contains("quests." + questKey + ".options.same-quest-only")) {
             opts.setShareSameQuestOnly(config.getBoolean("quests." + questKey + ".options.same-quest-only"));
         }
+        if (config.contains("quests." + questKey + ".options.share-distance")) {
+            opts.setShareDistance(config.getDouble("quests." + questKey + ".options.share-distance"));
+        }
+        if (config.contains("quests." + questKey + ".options.handle-offline-players")) {
+            opts.setHandleOfflinePlayers(config.getBoolean("quests." + questKey + ".options.handle-offline-players"));
+        }
     }
 
     @SuppressWarnings({ "unchecked", "unused" })
diff --git a/main/src/main/java/me/blackvein/quests/Requirements.java b/main/src/main/java/me/blackvein/quests/Requirements.java
index b7db4ad55..ef2b98d86 100644
--- a/main/src/main/java/me/blackvein/quests/Requirements.java
+++ b/main/src/main/java/me/blackvein/quests/Requirements.java
@@ -1,5 +1,5 @@
 /*******************************************************************************************************
- * Continued by PikaMug (formerly HappyPikachu) with permission from _Blackvein_. All rights reserved.
+ * Copyright (c) 2014 PikaMug and contributors. All rights reserved.
  * 
  * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
diff --git a/main/src/main/java/me/blackvein/quests/Rewards.java b/main/src/main/java/me/blackvein/quests/Rewards.java
index bed2ee1a5..215c95634 100644
--- a/main/src/main/java/me/blackvein/quests/Rewards.java
+++ b/main/src/main/java/me/blackvein/quests/Rewards.java
@@ -1,5 +1,5 @@
 /*******************************************************************************************************
- * Continued by PikaMug (formerly HappyPikachu) with permission from _Blackvein_. All rights reserved.
+ * Copyright (c) 2014 PikaMug and contributors. All rights reserved.
  * 
  * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
@@ -112,7 +112,7 @@ public class Rewards {
     public int getPartiesExperience() {
         return partiesExperience;
     }
-    public void setPartiesExperience(int partiesExperience) {
+    public void setPartiesExperience(final int partiesExperience) {
         this.partiesExperience = partiesExperience;
     }
     public List<String> getPhatLoots() {
diff --git a/main/src/main/java/me/blackvein/quests/Settings.java b/main/src/main/java/me/blackvein/quests/Settings.java
index 5de4b7382..aa1c6dab9 100644
--- a/main/src/main/java/me/blackvein/quests/Settings.java
+++ b/main/src/main/java/me/blackvein/quests/Settings.java
@@ -1,5 +1,5 @@
 /*******************************************************************************************************
- * Continued by PikaMug (formerly HappyPikachu) with permission from _Blackvein_. All rights reserved.
+ * Copyright (c) 2014 PikaMug and contributors. All rights reserved.
  * 
  * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
diff --git a/main/src/main/java/me/blackvein/quests/Stage.java b/main/src/main/java/me/blackvein/quests/Stage.java
index fe1ba0b53..ec56d4a0d 100644
--- a/main/src/main/java/me/blackvein/quests/Stage.java
+++ b/main/src/main/java/me/blackvein/quests/Stage.java
@@ -1,5 +1,5 @@
 /*******************************************************************************************************
- * Continued by PikaMug (formerly HappyPikachu) with permission from _Blackvein_. All rights reserved.
+ * Copyright (c) 2014 PikaMug and contributors. All rights reserved.
  * 
  * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
diff --git a/main/src/main/java/me/blackvein/quests/actions/Action.java b/main/src/main/java/me/blackvein/quests/actions/Action.java
index 12ee63c4d..833926518 100644
--- a/main/src/main/java/me/blackvein/quests/actions/Action.java
+++ b/main/src/main/java/me/blackvein/quests/actions/Action.java
@@ -1,5 +1,5 @@
 /*******************************************************************************************************
- * Continued by PikaMug (formerly HappyPikachu) with permission from _Blackvein_. All rights reserved.
+ * Copyright (c) 2014 PikaMug and contributors. All rights reserved.
  * 
  * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
@@ -9,7 +9,6 @@
  * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *******************************************************************************************************/
-
 package me.blackvein.quests.actions;
 
 import java.util.HashMap;
diff --git a/main/src/main/java/me/blackvein/quests/actions/ActionFactory.java b/main/src/main/java/me/blackvein/quests/actions/ActionFactory.java
index 3cfa913f1..d8cddaac4 100644
--- a/main/src/main/java/me/blackvein/quests/actions/ActionFactory.java
+++ b/main/src/main/java/me/blackvein/quests/actions/ActionFactory.java
@@ -1,5 +1,5 @@
 /*******************************************************************************************************
- * Continued by PikaMug (formerly HappyPikachu) with permission from _Blackvein_. All rights reserved.
+ * Copyright (c) 2014 PikaMug and contributors. All rights reserved.
  * 
  * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
diff --git a/main/src/main/java/me/blackvein/quests/conditions/Condition.java b/main/src/main/java/me/blackvein/quests/conditions/Condition.java
index 394916645..9006833d6 100644
--- a/main/src/main/java/me/blackvein/quests/conditions/Condition.java
+++ b/main/src/main/java/me/blackvein/quests/conditions/Condition.java
@@ -1,5 +1,5 @@
 /*******************************************************************************************************
- * Continued by PikaMug (formerly HappyPikachu) with permission from _Blackvein_. All rights reserved.
+ * Copyright (c) 2014 PikaMug and contributors. All rights reserved.
  * 
  * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
diff --git a/main/src/main/java/me/blackvein/quests/conditions/ConditionFactory.java b/main/src/main/java/me/blackvein/quests/conditions/ConditionFactory.java
index 33c0e0c62..016fc3590 100644
--- a/main/src/main/java/me/blackvein/quests/conditions/ConditionFactory.java
+++ b/main/src/main/java/me/blackvein/quests/conditions/ConditionFactory.java
@@ -1,5 +1,5 @@
 /*******************************************************************************************************
- * Continued by PikaMug (formerly HappyPikachu) with permission from _Blackvein_. All rights reserved.
+ * Copyright (c) 2014 PikaMug and contributors. All rights reserved.
  * 
  * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
diff --git a/main/src/main/java/me/blackvein/quests/convo/QuestsNumericPrompt.java b/main/src/main/java/me/blackvein/quests/convo/QuestsNumericPrompt.java
index 3a38f2a6a..f9bee8a80 100644
--- a/main/src/main/java/me/blackvein/quests/convo/QuestsNumericPrompt.java
+++ b/main/src/main/java/me/blackvein/quests/convo/QuestsNumericPrompt.java
@@ -1,5 +1,5 @@
 /*******************************************************************************************************
- * Continued by PikaMug (formerly HappyPikachu) with permission from _Blackvein_. All rights reserved.
+ * Copyright (c) 2014 PikaMug and contributors. All rights reserved.
  * 
  * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
diff --git a/main/src/main/java/me/blackvein/quests/convo/QuestsStringPrompt.java b/main/src/main/java/me/blackvein/quests/convo/QuestsStringPrompt.java
index 318f66369..a0a432d27 100644
--- a/main/src/main/java/me/blackvein/quests/convo/QuestsStringPrompt.java
+++ b/main/src/main/java/me/blackvein/quests/convo/QuestsStringPrompt.java
@@ -1,5 +1,5 @@
 /*******************************************************************************************************
- * Continued by PikaMug (formerly HappyPikachu) with permission from _Blackvein_. All rights reserved.
+ * Copyright (c) 2014 PikaMug and contributors. All rights reserved.
  * 
  * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
diff --git a/main/src/main/java/me/blackvein/quests/convo/actions/ActionsEditorNumericPrompt.java b/main/src/main/java/me/blackvein/quests/convo/actions/ActionsEditorNumericPrompt.java
index 749697e54..8aeb4195a 100644
--- a/main/src/main/java/me/blackvein/quests/convo/actions/ActionsEditorNumericPrompt.java
+++ b/main/src/main/java/me/blackvein/quests/convo/actions/ActionsEditorNumericPrompt.java
@@ -1,5 +1,5 @@
 /*******************************************************************************************************
- * Continued by PikaMug (formerly HappyPikachu) with permission from _Blackvein_. All rights reserved.
+ * Copyright (c) 2014 PikaMug and contributors. All rights reserved.
  * 
  * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
diff --git a/main/src/main/java/me/blackvein/quests/convo/actions/ActionsEditorStringPrompt.java b/main/src/main/java/me/blackvein/quests/convo/actions/ActionsEditorStringPrompt.java
index 4bfaea274..8f78c4a7a 100644
--- a/main/src/main/java/me/blackvein/quests/convo/actions/ActionsEditorStringPrompt.java
+++ b/main/src/main/java/me/blackvein/quests/convo/actions/ActionsEditorStringPrompt.java
@@ -1,5 +1,5 @@
 /*******************************************************************************************************
- * Continued by PikaMug (formerly HappyPikachu) with permission from _Blackvein_. All rights reserved.
+ * Copyright (c) 2014 PikaMug and contributors. All rights reserved.
  * 
  * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
diff --git a/main/src/main/java/me/blackvein/quests/convo/actions/main/ActionMainPrompt.java b/main/src/main/java/me/blackvein/quests/convo/actions/main/ActionMainPrompt.java
index 34b221752..ef0395764 100644
--- a/main/src/main/java/me/blackvein/quests/convo/actions/main/ActionMainPrompt.java
+++ b/main/src/main/java/me/blackvein/quests/convo/actions/main/ActionMainPrompt.java
@@ -1,5 +1,5 @@
 /*******************************************************************************************************
- * Continued by PikaMug (formerly HappyPikachu) with permission from _Blackvein_. All rights reserved.
+ * Copyright (c) 2014 PikaMug and contributors. All rights reserved.
  * 
  * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
diff --git a/main/src/main/java/me/blackvein/quests/convo/actions/menu/ActionMenuPrompt.java b/main/src/main/java/me/blackvein/quests/convo/actions/menu/ActionMenuPrompt.java
index 87189e3a9..a5717fec6 100644
--- a/main/src/main/java/me/blackvein/quests/convo/actions/menu/ActionMenuPrompt.java
+++ b/main/src/main/java/me/blackvein/quests/convo/actions/menu/ActionMenuPrompt.java
@@ -1,5 +1,5 @@
 /*******************************************************************************************************
- * Continued by PikaMug (formerly HappyPikachu) with permission from _Blackvein_. All rights reserved.
+ * Copyright (c) 2014 PikaMug and contributors. All rights reserved.
  * 
  * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
diff --git a/main/src/main/java/me/blackvein/quests/convo/actions/tasks/EffectPrompt.java b/main/src/main/java/me/blackvein/quests/convo/actions/tasks/EffectPrompt.java
index 396394518..2d2d2e6e2 100644
--- a/main/src/main/java/me/blackvein/quests/convo/actions/tasks/EffectPrompt.java
+++ b/main/src/main/java/me/blackvein/quests/convo/actions/tasks/EffectPrompt.java
@@ -1,5 +1,5 @@
 /*******************************************************************************************************
- * Continued by PikaMug (formerly HappyPikachu) with permission from _Blackvein_. All rights reserved.
+ * Copyright (c) 2014 PikaMug and contributors. All rights reserved.
  * 
  * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
diff --git a/main/src/main/java/me/blackvein/quests/convo/actions/tasks/PlayerPrompt.java b/main/src/main/java/me/blackvein/quests/convo/actions/tasks/PlayerPrompt.java
index daaffd657..0d49b2632 100644
--- a/main/src/main/java/me/blackvein/quests/convo/actions/tasks/PlayerPrompt.java
+++ b/main/src/main/java/me/blackvein/quests/convo/actions/tasks/PlayerPrompt.java
@@ -1,5 +1,5 @@
 /*******************************************************************************************************
- * Continued by PikaMug (formerly HappyPikachu) with permission from _Blackvein_. All rights reserved.
+ * Copyright (c) 2014 PikaMug and contributors. All rights reserved.
  * 
  * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
diff --git a/main/src/main/java/me/blackvein/quests/convo/actions/tasks/TimerPrompt.java b/main/src/main/java/me/blackvein/quests/convo/actions/tasks/TimerPrompt.java
index d3fe8c2f0..4325782b3 100644
--- a/main/src/main/java/me/blackvein/quests/convo/actions/tasks/TimerPrompt.java
+++ b/main/src/main/java/me/blackvein/quests/convo/actions/tasks/TimerPrompt.java
@@ -1,5 +1,5 @@
 /*******************************************************************************************************
- * Continued by PikaMug (formerly HappyPikachu) with permission from _Blackvein_. All rights reserved.
+ * Copyright (c) 2014 PikaMug and contributors. All rights reserved.
  * 
  * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
diff --git a/main/src/main/java/me/blackvein/quests/convo/actions/tasks/WeatherPrompt.java b/main/src/main/java/me/blackvein/quests/convo/actions/tasks/WeatherPrompt.java
index 892f8b8fc..054508401 100644
--- a/main/src/main/java/me/blackvein/quests/convo/actions/tasks/WeatherPrompt.java
+++ b/main/src/main/java/me/blackvein/quests/convo/actions/tasks/WeatherPrompt.java
@@ -1,5 +1,5 @@
 /*******************************************************************************************************
- * Continued by PikaMug (formerly HappyPikachu) with permission from _Blackvein_. All rights reserved.
+ * Copyright (c) 2014 PikaMug and contributors. All rights reserved.
  * 
  * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
diff --git a/main/src/main/java/me/blackvein/quests/convo/conditions/ConditionsEditorNumericPrompt.java b/main/src/main/java/me/blackvein/quests/convo/conditions/ConditionsEditorNumericPrompt.java
index 093d2cffb..aa3bf6372 100644
--- a/main/src/main/java/me/blackvein/quests/convo/conditions/ConditionsEditorNumericPrompt.java
+++ b/main/src/main/java/me/blackvein/quests/convo/conditions/ConditionsEditorNumericPrompt.java
@@ -1,5 +1,5 @@
 /*******************************************************************************************************
- * Continued by PikaMug (formerly HappyPikachu) with permission from _Blackvein_. All rights reserved.
+ * Copyright (c) 2014 PikaMug and contributors. All rights reserved.
  * 
  * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
diff --git a/main/src/main/java/me/blackvein/quests/convo/conditions/ConditionsEditorStringPrompt.java b/main/src/main/java/me/blackvein/quests/convo/conditions/ConditionsEditorStringPrompt.java
index 14839414a..5021b4b1e 100644
--- a/main/src/main/java/me/blackvein/quests/convo/conditions/ConditionsEditorStringPrompt.java
+++ b/main/src/main/java/me/blackvein/quests/convo/conditions/ConditionsEditorStringPrompt.java
@@ -1,5 +1,5 @@
 /*******************************************************************************************************
- * Continued by PikaMug (formerly HappyPikachu) with permission from _Blackvein_. All rights reserved.
+ * Copyright (c) 2014 PikaMug and contributors. All rights reserved.
  * 
  * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
diff --git a/main/src/main/java/me/blackvein/quests/convo/conditions/main/ConditionMainPrompt.java b/main/src/main/java/me/blackvein/quests/convo/conditions/main/ConditionMainPrompt.java
index 1f2427ec5..e73abcf2d 100644
--- a/main/src/main/java/me/blackvein/quests/convo/conditions/main/ConditionMainPrompt.java
+++ b/main/src/main/java/me/blackvein/quests/convo/conditions/main/ConditionMainPrompt.java
@@ -1,5 +1,5 @@
 /*******************************************************************************************************
- * Continued by PikaMug (formerly HappyPikachu) with permission from _Blackvein_. All rights reserved.
+ * Copyright (c) 2014 PikaMug and contributors. All rights reserved.
  * 
  * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
diff --git a/main/src/main/java/me/blackvein/quests/convo/conditions/menu/ConditionMenuPrompt.java b/main/src/main/java/me/blackvein/quests/convo/conditions/menu/ConditionMenuPrompt.java
index eddbda110..d2bbae33c 100644
--- a/main/src/main/java/me/blackvein/quests/convo/conditions/menu/ConditionMenuPrompt.java
+++ b/main/src/main/java/me/blackvein/quests/convo/conditions/menu/ConditionMenuPrompt.java
@@ -1,5 +1,5 @@
 /*******************************************************************************************************
- * Continued by PikaMug (formerly HappyPikachu) with permission from _Blackvein_. All rights reserved.
+ * Copyright (c) 2014 PikaMug and contributors. All rights reserved.
  * 
  * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
diff --git a/main/src/main/java/me/blackvein/quests/convo/conditions/tasks/EntityPrompt.java b/main/src/main/java/me/blackvein/quests/convo/conditions/tasks/EntityPrompt.java
index a1c594587..6d62affdd 100644
--- a/main/src/main/java/me/blackvein/quests/convo/conditions/tasks/EntityPrompt.java
+++ b/main/src/main/java/me/blackvein/quests/convo/conditions/tasks/EntityPrompt.java
@@ -1,5 +1,5 @@
 /*******************************************************************************************************
- * Continued by PikaMug (formerly HappyPikachu) with permission from _Blackvein_. All rights reserved.
+ * Copyright (c) 2014 PikaMug and contributors. All rights reserved.
  * 
  * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
diff --git a/main/src/main/java/me/blackvein/quests/convo/conditions/tasks/PlayerPrompt.java b/main/src/main/java/me/blackvein/quests/convo/conditions/tasks/PlayerPrompt.java
index f01303448..0e90b0258 100644
--- a/main/src/main/java/me/blackvein/quests/convo/conditions/tasks/PlayerPrompt.java
+++ b/main/src/main/java/me/blackvein/quests/convo/conditions/tasks/PlayerPrompt.java
@@ -1,5 +1,5 @@
 /*******************************************************************************************************
- * Continued by PikaMug (formerly HappyPikachu) with permission from _Blackvein_. All rights reserved.
+ * Copyright (c) 2014 PikaMug and contributors. All rights reserved.
  * 
  * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
diff --git a/main/src/main/java/me/blackvein/quests/convo/conditions/tasks/WorldPrompt.java b/main/src/main/java/me/blackvein/quests/convo/conditions/tasks/WorldPrompt.java
index 9386058f2..19299746f 100644
--- a/main/src/main/java/me/blackvein/quests/convo/conditions/tasks/WorldPrompt.java
+++ b/main/src/main/java/me/blackvein/quests/convo/conditions/tasks/WorldPrompt.java
@@ -1,5 +1,5 @@
 /*******************************************************************************************************
- * Continued by PikaMug (formerly HappyPikachu) with permission from _Blackvein_. All rights reserved.
+ * Copyright (c) 2014 PikaMug and contributors. All rights reserved.
  * 
  * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
diff --git a/main/src/main/java/me/blackvein/quests/convo/generic/ItemStackPrompt.java b/main/src/main/java/me/blackvein/quests/convo/generic/ItemStackPrompt.java
index a2ac0aee1..3daf43874 100644
--- a/main/src/main/java/me/blackvein/quests/convo/generic/ItemStackPrompt.java
+++ b/main/src/main/java/me/blackvein/quests/convo/generic/ItemStackPrompt.java
@@ -1,5 +1,5 @@
 /*******************************************************************************************************
- * Continued by PikaMug (formerly HappyPikachu) with permission from _Blackvein_. All rights reserved.
+ * Copyright (c) 2014 PikaMug and contributors. All rights reserved.
  * 
  * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
diff --git a/main/src/main/java/me/blackvein/quests/convo/generic/OverridePrompt.java b/main/src/main/java/me/blackvein/quests/convo/generic/OverridePrompt.java
index 075500266..af425534c 100644
--- a/main/src/main/java/me/blackvein/quests/convo/generic/OverridePrompt.java
+++ b/main/src/main/java/me/blackvein/quests/convo/generic/OverridePrompt.java
@@ -1,5 +1,5 @@
 /*******************************************************************************************************
- * Continued by PikaMug (formerly HappyPikachu) with permission from _Blackvein_. All rights reserved.
+ * Copyright (c) 2014 PikaMug and contributors. All rights reserved.
  * 
  * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
diff --git a/main/src/main/java/me/blackvein/quests/convo/npcs/NpcOfferQuestPrompt.java b/main/src/main/java/me/blackvein/quests/convo/npcs/NpcOfferQuestPrompt.java
index e9b9845f7..0ce4d01d0 100644
--- a/main/src/main/java/me/blackvein/quests/convo/npcs/NpcOfferQuestPrompt.java
+++ b/main/src/main/java/me/blackvein/quests/convo/npcs/NpcOfferQuestPrompt.java
@@ -1,5 +1,5 @@
 /*******************************************************************************************************
- * Continued by PikaMug (formerly HappyPikachu) with permission from _Blackvein_. All rights reserved.
+ * Copyright (c) 2014 PikaMug and contributors. All rights reserved.
  * 
  * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
diff --git a/main/src/main/java/me/blackvein/quests/convo/quests/options/OptionsPrompt.java b/main/src/main/java/me/blackvein/quests/convo/quests/options/OptionsPrompt.java
index 10b901009..8c113c66d 100644
--- a/main/src/main/java/me/blackvein/quests/convo/quests/options/OptionsPrompt.java
+++ b/main/src/main/java/me/blackvein/quests/convo/quests/options/OptionsPrompt.java
@@ -273,6 +273,48 @@ public class OptionsPrompt extends QuestsEditorNumericPrompt {
         }
     }
     
+    public class OptionsDistancePrompt extends QuestsEditorStringPrompt {
+        public OptionsDistancePrompt(final ConversationContext context) {
+            super(context);
+        }
+        
+        @Override
+        public String getTitle(final ConversationContext context) {
+            return null;
+        }
+        
+        @Override
+        public String getQueryText(final ConversationContext context) {
+            return Lang.get("optDistancePrompt");
+        }
+
+        @Override
+        public String getPromptText(final ConversationContext context) {
+            final QuestsEditorPostOpenStringPromptEvent event = new QuestsEditorPostOpenStringPromptEvent(context, this);
+            context.getPlugin().getServer().getPluginManager().callEvent(event);
+            
+            return ChatColor.YELLOW + getQueryText(context);
+        }
+
+        @Override
+        public Prompt acceptInput(final ConversationContext context, final String input) {
+            if (input.equalsIgnoreCase(Lang.get("cmdCancel")) == false 
+                    && input.equalsIgnoreCase(Lang.get("cmdClear")) == false) {
+                try {
+                    final double d = Double.parseDouble(input);
+                    context.setSessionData(tempKey, d);
+                } catch (final Exception e) {
+                    context.getForWhom().sendRawMessage(ChatColor.RED + Lang.get("reqNotANumber")
+                            .replace("<input>", input));
+                }
+            } else if (input.equalsIgnoreCase(Lang.get("cmdClear"))) {
+                context.setSessionData(tempKey, null);
+                return tempPrompt;
+            }
+            return tempPrompt;
+        }
+    }
+    
     public class OptionsGeneralPrompt extends QuestsEditorNumericPrompt {
         public OptionsGeneralPrompt(final ConversationContext context) {
             super(context);
@@ -414,7 +456,7 @@ public class OptionsPrompt extends QuestsEditorNumericPrompt {
             super(context);
         }
 
-        private final int size = 5;
+        private final int size = 7;
         
         @Override
         public int getSize() {
@@ -438,6 +480,10 @@ public class OptionsPrompt extends QuestsEditorNumericPrompt {
             case 4:
                 return ChatColor.BLUE;
             case 5:
+                return ChatColor.BLUE;
+            case 6:
+                return ChatColor.BLUE;
+            case 7:
                 return ChatColor.GREEN;
              default:
                 return null;
@@ -456,6 +502,10 @@ public class OptionsPrompt extends QuestsEditorNumericPrompt {
             case 4:
                 return ChatColor.YELLOW + Lang.get("optShareOnlySameQuest");
             case 5:
+                return ChatColor.YELLOW + Lang.get("optShareDistance");
+            case 6:
+                return ChatColor.YELLOW + Lang.get("optHandleOfflinePlayer");
+            case 7:
                 return ChatColor.YELLOW + Lang.get("done");
              default:
                 return null;
@@ -498,18 +548,38 @@ public class OptionsPrompt extends QuestsEditorNumericPrompt {
                     return ChatColor.GRAY + "(" + ChatColor.AQUA + String.valueOf(shareOpt) + ChatColor.GRAY + ")";
                 }
             case 4:
-                if (context.getSessionData(CK.OPT_SAME_QUEST_ONLY) == null) {
+                if (context.getSessionData(CK.OPT_SHARE_SAME_QUEST_ONLY) == null) {
                     final boolean defaultOpt = new Options().canShareSameQuestOnly();
                     return ChatColor.GRAY + "(" + (defaultOpt ? ChatColor.GREEN 
                             + Lang.get(String.valueOf(defaultOpt)) : ChatColor.RED 
                             + Lang.get(String.valueOf(defaultOpt))) + ChatColor.GRAY + ")";
                 } else {
-                    final boolean requireOpt = (Boolean) context.getSessionData(CK.OPT_SAME_QUEST_ONLY);
+                    final boolean requireOpt = (Boolean) context.getSessionData(CK.OPT_SHARE_SAME_QUEST_ONLY);
                     return ChatColor.GRAY + "(" + (requireOpt ? ChatColor.GREEN 
                             + Lang.get(String.valueOf(requireOpt)) : ChatColor.RED 
                             + Lang.get(String.valueOf(requireOpt))) + ChatColor.GRAY +  ")";
                 }
             case 5:
+                if (context.getSessionData(CK.OPT_SHARE_DISTANCE) == null) {
+                    final double defaultOpt = new Options().getShareDistance();
+                    return ChatColor.GRAY + "(" + ChatColor.AQUA + String.valueOf(defaultOpt) + ChatColor.GRAY + ")";
+                } else {
+                    final double shareOpt = (Double) context.getSessionData(CK.OPT_SHARE_DISTANCE);
+                    return ChatColor.GRAY + "(" + ChatColor.AQUA + String.valueOf(shareOpt) + ChatColor.GRAY + ")";
+                }
+            case 6:
+                if (context.getSessionData(CK.OPT_HANDLE_OFFLINE_PLAYERS) == null) {
+                    final boolean defaultOpt = new Options().canHandleOfflinePlayers();
+                    return ChatColor.GRAY + "("+ (defaultOpt ? ChatColor.GREEN 
+                           + Lang.get(String.valueOf(defaultOpt)) : ChatColor.RED 
+                           + Lang.get(String.valueOf(defaultOpt))) + ChatColor.GRAY + ")";
+                } else {
+                    final boolean handleOpt = (Boolean) context.getSessionData(CK.OPT_HANDLE_OFFLINE_PLAYERS);
+                    return ChatColor.GRAY + "(" + (handleOpt ? ChatColor.GREEN 
+                            + Lang.get(String.valueOf(handleOpt)) : ChatColor.RED 
+                            + Lang.get(String.valueOf(handleOpt))) + ChatColor.GRAY +  ")";
+                }
+            case 7:
                 return "";
             default:
                 return null;
@@ -545,10 +615,18 @@ public class OptionsPrompt extends QuestsEditorNumericPrompt {
                 tempPrompt = new OptionsMultiplayerPrompt(context);
                 return new OptionsLevelPrompt(context);
             case 4:
-                tempKey = CK.OPT_SAME_QUEST_ONLY;
+                tempKey = CK.OPT_SHARE_SAME_QUEST_ONLY;
                 tempPrompt = new OptionsMultiplayerPrompt(context);
                 return new OptionsTrueFalsePrompt(context);
             case 5:
+                tempKey = CK.OPT_SHARE_DISTANCE;
+                tempPrompt = new OptionsMultiplayerPrompt(context);
+                return new OptionsDistancePrompt(context);
+            case 6:
+                tempKey = CK.OPT_HANDLE_OFFLINE_PLAYERS;
+                tempPrompt = new OptionsMultiplayerPrompt(context);
+                return new OptionsTrueFalsePrompt(context);
+            case 7:
                 tempKey = null;
                 tempPrompt = null;
                 try {
diff --git a/main/src/main/java/me/blackvein/quests/util/CK.java b/main/src/main/java/me/blackvein/quests/util/CK.java
index 4c5a8eaf0..bc0c281c0 100644
--- a/main/src/main/java/me/blackvein/quests/util/CK.java
+++ b/main/src/main/java/me/blackvein/quests/util/CK.java
@@ -69,9 +69,6 @@ public class CK {
     public static final String S_SMELT_ITEMS = "smeltItems";
     public static final String S_CONSUME_ITEMS = "consumeItems";
     public static final String S_ENCHANT_ITEMS = "enchantItems";
-    //public static final String S_ENCHANT_TYPES = "enchantTypes";
-    //public static final String S_ENCHANT_NAMES = "enchantNames";
-    //public static final String S_ENCHANT_AMOUNTS = "enchantAmounts";
     public static final String S_BREW_ITEMS = "brewItems";
     public static final String S_DELIVERY_ITEMS = "deliveryItems";
     public static final String S_DELIVERY_NPCS = "deliveryNPCs";
@@ -149,7 +146,9 @@ public class CK {
     public static final String OPT_USE_DUNGEONSXL_PLUGIN = "useDungeonsXLPluginOpt";
     public static final String OPT_USE_PARTIES_PLUGIN = "usePartiesPluginOpt";
     public static final String OPT_SHARE_PROGRESS_LEVEL = "shareProgressLevelOpt";
-    public static final String OPT_SAME_QUEST_ONLY = "sameQuestOnlyOpt";
+    public static final String OPT_SHARE_SAME_QUEST_ONLY = "shareSameQuestOnlyOpt";
+    public static final String OPT_SHARE_DISTANCE = "shareDistance";
+    public static final String OPT_HANDLE_OFFLINE_PLAYERS = "handleOfflinePlayers";
     // Actions
     public static final String E_OLD_EVENT = "oldEvent";
     public static final String E_NAME = "evtName";
diff --git a/main/src/main/resources/strings.yml b/main/src/main/resources/strings.yml
index 73516f1db..5c08ac38c 100644
--- a/main/src/main/resources/strings.yml
+++ b/main/src/main/resources/strings.yml
@@ -488,6 +488,7 @@ optBooleanQuery: "Select '<true>' or '<false>'"
 optBooleanPrompt: "Enter '<true>' or '<false>', <clear>, <cancel>"
 optNumberQuery: "Pick level of progress sharing"
 optNumberPrompt: "Enter a level (number) for tracking progress, <clear>, <cancel>"
+optDistancePrompt: "Enter a distance (number) for share radius, <clear>, <cancel>"
 optAllowCommands: "Allow commands during quest"
 optAllowQuitting: "Allow quitting during quest"
 optIgnoreSilkTouch: "Ignore blocks broken with Silk Touch"
@@ -496,6 +497,8 @@ optUseDungeonsXLPlugin: "Use DungeonsXL plugin"
 optUsePartiesPlugin: "Use Parties plugin"
 optShareProgressLevel: "Level of progress sharing"
 optShareOnlySameQuest: "Share with the same quest only"
+optShareDistance: "Maximum radial distance"
+optHandleOfflinePlayer: "Include offline players"
 rewSetMoney: "Set money reward"
 rewSetQuestPoints: "Set <points> reward"
 rewSetItems: "Set item rewards"