diff --git a/main/src/main/java/me/blackvein/quests/CustomRequirement.java b/main/src/main/java/me/blackvein/quests/CustomRequirement.java
index 58d603952..e4d4afc4e 100644
--- a/main/src/main/java/me/blackvein/quests/CustomRequirement.java
+++ b/main/src/main/java/me/blackvein/quests/CustomRequirement.java
@@ -12,19 +12,19 @@
 
 package me.blackvein.quests;
 
+import org.bukkit.entity.Player;
+
 import java.util.HashMap;
 import java.util.Map;
 
-import org.bukkit.entity.Player;
-
 public abstract class CustomRequirement {
 
     private String name = null;
     private String author = null;
     private String display = null;
-    private final Map<String, Short> items = new HashMap<String, Short>();
-    private final Map<String, Object> data = new HashMap<String, Object>();
-    private final Map<String, String> descriptions = new HashMap<String, String>();
+    private final Map<String, Short> items = new HashMap<>();
+    private final Map<String, Object> data = new HashMap<>();
+    private final Map<String, String> descriptions = new HashMap<>();
 
     public abstract boolean testRequirement(Player p, Map<String, Object> m);
 
diff --git a/main/src/main/java/me/blackvein/quests/CustomReward.java b/main/src/main/java/me/blackvein/quests/CustomReward.java
index ab6ed7e38..ada4e17f8 100644
--- a/main/src/main/java/me/blackvein/quests/CustomReward.java
+++ b/main/src/main/java/me/blackvein/quests/CustomReward.java
@@ -12,19 +12,19 @@
 
 package me.blackvein.quests;
 
+import org.bukkit.entity.Player;
+
 import java.util.HashMap;
 import java.util.Map;
 
-import org.bukkit.entity.Player;
-
 public abstract class CustomReward {
 
     private String name = null;
     private String author = null;
     private String display = null;
-    private final Map<String, Short> items = new HashMap<String, Short>();
-    private final Map<String, Object> data = new HashMap<String, Object>();
-    private final Map<String, String> descriptions = new HashMap<String, String>();
+    private final Map<String, Short> items = new HashMap<>();
+    private final Map<String, Object> data = new HashMap<>();
+    private final Map<String, String> descriptions = new HashMap<>();
 
     public abstract void giveReward(Player p, Map<String, Object> m);
 
diff --git a/main/src/main/java/me/blackvein/quests/Planner.java b/main/src/main/java/me/blackvein/quests/Planner.java
index 8fa281ac3..8dbe002f0 100644
--- a/main/src/main/java/me/blackvein/quests/Planner.java
+++ b/main/src/main/java/me/blackvein/quests/Planner.java
@@ -31,8 +31,8 @@ public class Planner {
         }
         final Calendar cal = Calendar.getInstance();
         final String[] s = start.split(":");
-        cal.set(Integer.valueOf(s[2]), Integer.valueOf(s[1]), Integer.valueOf(s[0]),
-                Integer.valueOf(s[3]), Integer.valueOf(s[4]), Integer.valueOf(s[5]));
+        cal.set(Integer.parseInt(s[2]), Integer.parseInt(s[1]), Integer.parseInt(s[0]),
+                Integer.parseInt(s[3]), Integer.parseInt(s[4]), Integer.parseInt(s[5]));
         final TimeZone tz = TimeZone.getTimeZone(s[6]);
         cal.setTimeZone(tz);
         return cal.getTimeInMillis();
@@ -52,8 +52,8 @@ public class Planner {
         }
         final Calendar cal = Calendar.getInstance();
         final String[] s = end.split(":");
-        cal.set(Integer.valueOf(s[2]), Integer.valueOf(s[1]), Integer.valueOf(s[0]),
-                Integer.valueOf(s[3]), Integer.valueOf(s[4]), Integer.valueOf(s[5]));
+        cal.set(Integer.parseInt(s[2]), Integer.parseInt(s[1]), Integer.parseInt(s[0]),
+                Integer.parseInt(s[3]), Integer.parseInt(s[4]), Integer.parseInt(s[5]));
         final TimeZone tz = TimeZone.getTimeZone(s[6]);
         cal.setTimeZone(tz);
         return cal.getTimeInMillis();
diff --git a/main/src/main/java/me/blackvein/quests/Quest.java b/main/src/main/java/me/blackvein/quests/Quest.java
index 6fcde4ad6..c538659a1 100644
--- a/main/src/main/java/me/blackvein/quests/Quest.java
+++ b/main/src/main/java/me/blackvein/quests/Quest.java
@@ -69,10 +69,10 @@ public class Quest implements Comparable<Quest> {
     protected Location blockStart;
     protected String regionStart = null;
     protected Action initialAction;
-    private final Requirements reqs = new Requirements();
-    private final Planner pln = new Planner();
-    private final Rewards rews = new Rewards();
-    private final Options opts = new Options();
+    private final Requirements requirements = new Requirements();
+    private final Planner planner = new Planner();
+    private final Rewards rewards = new Rewards();
+    private final Options options = new Options();
 
     @Override
     public int compareTo(final Quest quest) {
@@ -160,19 +160,19 @@ public class Quest implements Comparable<Quest> {
     }
     
     public Requirements getRequirements() {
-        return reqs;
+        return requirements;
     }
     
     public Planner getPlanner() {
-        return pln;
+        return planner;
     }
     
     public Rewards getRewards() {
-        return rews;
+        return rewards;
     }
     
     public Options getOptions() {
-        return opts;
+        return options;
     }
 
     /**
@@ -216,7 +216,7 @@ public class Quest implements Comparable<Quest> {
             }
             
             // Multiplayer
-            if (allowSharedProgress && opts.getShareProgressLevel() == 3) {
+            if (allowSharedProgress && options.getShareProgressLevel() == 3) {
                 final List<Quester> mq = quester.getMultiplayerQuesters(this);
                 for (final Quester qq : mq) {
                     if (currentStage.equals(qq.getCurrentStage(this))) {
@@ -441,36 +441,36 @@ public class Quest implements Comparable<Quest> {
      */
     protected boolean testRequirements(final OfflinePlayer player) {
         final Quester quester = plugin.getQuester(player.getUniqueId());
-        if (reqs.getMoney() != 0 && plugin.getDependencies().getVaultEconomy() != null) {
-            if (plugin.getDependencies().getVaultEconomy().getBalance(player) < reqs.getMoney()) {
+        if (requirements.getMoney() != 0 && plugin.getDependencies().getVaultEconomy() != null) {
+            if (plugin.getDependencies().getVaultEconomy().getBalance(player) < requirements.getMoney()) {
                 return false;
             }
         }
-        if (quester.questPoints < reqs.getQuestPoints()) {
+        if (quester.questPoints < requirements.getQuestPoints()) {
             return false;
         }
-        if (!quester.completedQuests.containsAll(reqs.getNeededQuests())) {
+        if (!quester.completedQuests.containsAll(requirements.getNeededQuests())) {
             return false;
         }
-        for (final Quest q : reqs.getBlockQuests()) {
+        for (final Quest q : requirements.getBlockQuests()) {
             if (quester.completedQuests.contains(q) || quester.currentQuests.containsKey(q)) {
                 return false;
             }
         }
-        for (final String s : reqs.getMcmmoSkills()) {
+        for (final String s : requirements.getMcmmoSkills()) {
             final SkillType st = Quests.getMcMMOSkill(s);
-            final int lvl = reqs.getMcmmoAmounts().get(reqs.getMcmmoSkills().indexOf(s));
+            final int lvl = requirements.getMcmmoAmounts().get(requirements.getMcmmoSkills().indexOf(s));
             if (UserManager.getOfflinePlayer(player).getProfile().getSkillLevel(st) < lvl) {
                 return false;
             }
         }
-        if (reqs.getHeroesPrimaryClass() != null) {
-            if (!plugin.getDependencies().testPrimaryHeroesClass(reqs.getHeroesPrimaryClass(), player.getUniqueId())) {
+        if (requirements.getHeroesPrimaryClass() != null) {
+            if (!plugin.getDependencies().testPrimaryHeroesClass(requirements.getHeroesPrimaryClass(), player.getUniqueId())) {
                 return false;
             }
         }
-        if (reqs.getHeroesSecondaryClass() != null) {
-            if (!plugin.getDependencies().testSecondaryHeroesClass(reqs.getHeroesSecondaryClass(),
+        if (requirements.getHeroesSecondaryClass() != null) {
+            if (!plugin.getDependencies().testSecondaryHeroesClass(requirements.getHeroesSecondaryClass(),
                     player.getUniqueId())) {
                 return false;
             }
@@ -479,19 +479,19 @@ public class Quest implements Comparable<Quest> {
             final Player p = (Player)player;
             final Inventory fakeInv = Bukkit.createInventory(null, InventoryType.PLAYER);
             fakeInv.setContents(p.getInventory().getContents().clone());
-            for (final ItemStack is : reqs.getItems()) {
+            for (final ItemStack is : requirements.getItems()) {
                 if (InventoryUtil.canRemoveItem(fakeInv, is)) {
                     InventoryUtil.removeItem(fakeInv, is);
                 } else {
                     return false;
                 }
             }
-            for (final String s : reqs.getPermissions()) {
+            for (final String s : requirements.getPermissions()) {
                 if (!p.hasPermission(s)) {
                     return false;
                 }
             }
-            for (final String s : reqs.getCustomRequirements().keySet()) {
+            for (final String s : requirements.getCustomRequirements().keySet()) {
                 CustomRequirement found = null;
                 for (final CustomRequirement cr : plugin.getCustomRequirements()) {
                     if (cr.getName().equalsIgnoreCase(s)) {
@@ -500,7 +500,7 @@ public class Quest implements Comparable<Quest> {
                     }
                 }
                 if (found != null) {
-                    if (!found.testRequirement(p, reqs.getCustomRequirements().get(s))) {
+                    if (!found.testRequirement(p, requirements.getCustomRequirements().get(s))) {
                         return false;
                     }
                 } else {
@@ -571,7 +571,7 @@ public class Quest implements Comparable<Quest> {
                     + finished, this, p);
             Bukkit.getScheduler().runTaskLater(plugin, () -> p.sendMessage(ps), 40);
         }
-        if (pln.getCooldown() > -1) {
+        if (planner.getCooldown() > -1) {
             quester.completedTimes.put(this, System.currentTimeMillis());
             if (quester.amountsCompleted.containsKey(this)) {
                 quester.amountsCompleted.put(this, quester.amountsCompleted.get(this) + 1);
@@ -583,16 +583,16 @@ public class Quest implements Comparable<Quest> {
         // Issue rewards
         final Dependencies depends = plugin.getDependencies();
         boolean issuedReward = false;
-        if (rews.getMoney() > 0 && depends.getVaultEconomy() != null) {
-            depends.getVaultEconomy().depositPlayer(player, rews.getMoney());
+        if (rewards.getMoney() > 0 && depends.getVaultEconomy() != null) {
+            depends.getVaultEconomy().depositPlayer(player, rewards.getMoney());
             issuedReward = true;
             if (plugin.getSettings().getConsoleLogging() > 2) {
                 plugin.getLogger().info(player.getUniqueId() + " was rewarded "
-                        + depends.getVaultEconomy().format(rews.getMoney()));
+                        + depends.getVaultEconomy().format(rewards.getMoney()));
             }
         }
         if (player.isOnline()) {
-            for (final ItemStack i : rews.getItems()) {
+            for (final ItemStack i : rewards.getItems()) {
                 try {
                     InventoryUtil.addItem(player.getPlayer(), i);
                 } catch (final Exception e) {
@@ -608,7 +608,7 @@ public class Quest implements Comparable<Quest> {
                 }
             }
         }
-        for (final String s : rews.getCommands()) {
+        for (final String s : rewards.getCommands()) {
             if (player.getName() == null) {
                 continue;
             }
@@ -628,12 +628,12 @@ public class Quest implements Comparable<Quest> {
                 plugin.getLogger().info(player.getUniqueId() + " was rewarded command " + s);
             }
         }
-        for (int i = 0; i < rews.getPermissions().size(); i++) {
+        for (int i = 0; i < rewards.getPermissions().size(); i++) {
             if (depends.getVaultPermission() != null) {
-                final String perm = rews.getPermissions().get(i);
+                final String perm = rewards.getPermissions().get(i);
                 String world = null;
-                if (i < rews.getPermissionWorlds().size()) {
-                    world = rews.getPermissionWorlds().get(i);
+                if (i < rewards.getPermissionWorlds().size()) {
+                    world = rewards.getPermissionWorlds().get(i);
                 }
                 if (world == null || world.equals("null")) {
                     depends.getVaultPermission().playerAdd(null, player, perm);
@@ -646,8 +646,8 @@ public class Quest implements Comparable<Quest> {
                 issuedReward = true;
             }
         }
-        for (final String s : rews.getMcmmoSkills()) {
-            final int levels = rews.getMcmmoAmounts().get(rews.getMcmmoSkills().indexOf(s));
+        for (final String s : rewards.getMcmmoSkills()) {
+            final int levels = rewards.getMcmmoAmounts().get(rewards.getMcmmoSkills().indexOf(s));
             UserManager.getOfflinePlayer(player).getProfile().addLevels(Quests.getMcMMOSkill(s), levels);
             if (plugin.getSettings().getConsoleLogging() > 2) {
                 plugin.getLogger().info(player.getUniqueId() + " was rewarded " + s + " x " + levels);
@@ -655,9 +655,9 @@ public class Quest implements Comparable<Quest> {
             issuedReward = true;
         }
         if (player.isOnline()) {
-            for (final String s : rews.getHeroesClasses()) {
+            for (final String s : rewards.getHeroesClasses()) {
                 final Hero hero = plugin.getDependencies().getHero(player.getUniqueId());
-                final double expChange = rews.getHeroesAmounts().get(rews.getHeroesClasses().indexOf(s));
+                final double expChange = rewards.getHeroesAmounts().get(rewards.getHeroesClasses().indexOf(s));
                 hero.addExp(expChange, plugin.getDependencies().getHeroes().getClassManager().getClass(s), 
                         ((Player)player).getLocation());
                 if (plugin.getSettings().getConsoleLogging() > 2) {
@@ -666,16 +666,16 @@ public class Quest implements Comparable<Quest> {
                 issuedReward = true;
             }
         }
-        if (rews.getPartiesExperience() > 0 && depends.getPartiesApi() != null) {
+        if (rewards.getPartiesExperience() > 0 && depends.getPartiesApi() != null) {
             final PartyPlayer partyPlayer = depends.getPartiesApi().getPartyPlayer(player.getUniqueId());
             if (partyPlayer != null && partyPlayer.getPartyId() != null) {
                 final Party party = depends.getPartiesApi().getParty(partyPlayer.getPartyId());
                 if (party != null) {
-                    party.giveExperience(rews.getPartiesExperience());
+                    party.giveExperience(rewards.getPartiesExperience());
                     issuedReward = true;
                     if (plugin.getSettings().getConsoleLogging() > 2) {
                         plugin.getLogger().info(player.getUniqueId() + " was rewarded "
-                                + rews.getPartiesExperience() + " party experience");
+                                + rewards.getPartiesExperience() + " party experience");
                     }
                 }
             }
@@ -683,7 +683,7 @@ public class Quest implements Comparable<Quest> {
         final LinkedList<ItemStack> phatLootItems = new LinkedList<>();
         int phatLootExp = 0;
         final LinkedList<String> phatLootMessages = new LinkedList<>();
-        for (final String s : rews.getPhatLoots()) {
+        for (final String s : rewards.getPhatLoots()) {
             final LootBundle lb = PhatLootsAPI.getPhatLoot(s).rollForLoot();
             if (lb.getExp() > 0) {
                 phatLootExp += lb.getExp();
@@ -724,25 +724,25 @@ public class Quest implements Comparable<Quest> {
             }
             issuedReward = true;
         }
-        if (rews.getExp() > 0 && player.isOnline()) {
-            ((Player)player).giveExp(rews.getExp());
+        if (rewards.getExp() > 0 && player.isOnline()) {
+            ((Player)player).giveExp(rewards.getExp());
             if (plugin.getSettings().getConsoleLogging() > 2) {
-                plugin.getLogger().info(player.getUniqueId() + " was rewarded exp " + rews.getExp());
+                plugin.getLogger().info(player.getUniqueId() + " was rewarded exp " + rewards.getExp());
             }
             issuedReward = true;
         }
-        if (rews.getQuestPoints() > 0) {
-            quester.questPoints += rews.getQuestPoints();
+        if (rewards.getQuestPoints() > 0) {
+            quester.questPoints += rewards.getQuestPoints();
             if (plugin.getSettings().getConsoleLogging() > 2) {
-                plugin.getLogger().info(player.getUniqueId() + " was rewarded " + rews.getQuestPoints() + " "
+                plugin.getLogger().info(player.getUniqueId() + " was rewarded " + rewards.getQuestPoints() + " "
                         + Lang.get("questPoints"));
             }
             issuedReward = true;
         }
-        if (!rews.getCustomRewards().isEmpty()) {
+        if (!rewards.getCustomRewards().isEmpty()) {
             issuedReward = true;
             if (plugin.getSettings().getConsoleLogging() > 2) {
-                for (final String s : rews.getCustomRewards().keySet()) {
+                for (final String s : rewards.getCustomRewards().keySet()) {
                     plugin.getLogger().info(player.getUniqueId() + " was custom rewarded " + s);
                 }
             }
@@ -763,8 +763,8 @@ public class Quest implements Comparable<Quest> {
             Lang.send(p, ChatColor.GREEN + Lang.get(p, "questRewardsTitle"));
             if (!issuedReward) {
                 p.sendMessage(ChatColor.GRAY + "- (" + Lang.get("none") + ")");
-            } else if (!rews.getDetailsOverride().isEmpty()) {
-                for (final String s: rews.getDetailsOverride()) {
+            } else if (!rewards.getDetailsOverride().isEmpty()) {
+                for (final String s: rewards.getDetailsOverride()) {
                     String message = ChatColor.DARK_GREEN + ConfigUtil.parseString(
                             ChatColor.translateAlternateColorCodes('&', s));
                     if (plugin.getDependencies().getPlaceholderApi() != null) {
@@ -773,11 +773,11 @@ public class Quest implements Comparable<Quest> {
                     quester.sendMessage("- " + message);
                 }
             } else {
-                if (rews.getQuestPoints() > 0) {
-                    quester.sendMessage("- " + ChatColor.DARK_GREEN + rews.getQuestPoints() + " "
+                if (rewards.getQuestPoints() > 0) {
+                    quester.sendMessage("- " + ChatColor.DARK_GREEN + rewards.getQuestPoints() + " "
                             + Lang.get(p, "questPoints"));
                 }
-                for (final ItemStack i : rews.getItems()) {
+                for (final ItemStack i : rewards.getItems()) {
                     StringBuilder text;
                     if (i.getItemMeta() != null && i.getItemMeta().hasDisplayName()) {
                         if (i.getEnchantments().isEmpty()) {
@@ -873,23 +873,23 @@ public class Quest implements Comparable<Quest> {
                         }
                     }
                 }
-                if (rews.getMoney() > 0 && depends.getVaultEconomy() != null) {
+                if (rewards.getMoney() > 0 && depends.getVaultEconomy() != null) {
                     quester.sendMessage("- " + ChatColor.DARK_GREEN
-                            + depends.getVaultEconomy().format(rews.getMoney()));
+                            + depends.getVaultEconomy().format(rewards.getMoney()));
                 }
-                if (rews.getExp() > 0 || phatLootExp > 0) {
-                    final int tot = rews.getExp() + phatLootExp;
+                if (rewards.getExp() > 0 || phatLootExp > 0) {
+                    final int tot = rewards.getExp() + phatLootExp;
                     quester.sendMessage("- " + ChatColor.DARK_GREEN + tot + ChatColor.DARK_PURPLE + " "
                             + Lang.get(p, "experience"));
                 }
-                if (!rews.getCommands().isEmpty()) {
+                if (!rewards.getCommands().isEmpty()) {
                     int index = 0;
-                    for (final String s : rews.getCommands()) {
-                        if (!rews.getCommandsOverrideDisplay().isEmpty()
-                                && rews.getCommandsOverrideDisplay().size() > index) {
-                            if (!rews.getCommandsOverrideDisplay().get(index).trim().equals("")) {
+                    for (final String s : rewards.getCommands()) {
+                        if (!rewards.getCommandsOverrideDisplay().isEmpty()
+                                && rewards.getCommandsOverrideDisplay().size() > index) {
+                            if (!rewards.getCommandsOverrideDisplay().get(index).trim().equals("")) {
                                 quester.sendMessage("- " + ChatColor.DARK_GREEN
-                                        + rews.getCommandsOverrideDisplay().get(index));
+                                        + rewards.getCommandsOverrideDisplay().get(index));
                             }
                         } else {
                             quester.sendMessage("- " + ChatColor.DARK_GREEN + s);
@@ -897,12 +897,12 @@ public class Quest implements Comparable<Quest> {
                         index++;
                     }
                 }
-                if (!rews.getPermissions().isEmpty()) {
+                if (!rewards.getPermissions().isEmpty()) {
                     int index = 0;
-                    for (final String s : rews.getPermissions()) {
-                        if (rews.getPermissionWorlds() != null && rews.getPermissionWorlds().size() > index) {
+                    for (final String s : rewards.getPermissions()) {
+                        if (rewards.getPermissionWorlds() != null && rewards.getPermissionWorlds().size() > index) {
                             quester.sendMessage("- " + ChatColor.DARK_GREEN + s + " ("
-                                    + rews.getPermissionWorlds().get(index) + ")");
+                                    + rewards.getPermissionWorlds().get(index) + ")");
                         } else {
                             quester.sendMessage("- " + ChatColor.DARK_GREEN + s);
                             
@@ -910,22 +910,22 @@ public class Quest implements Comparable<Quest> {
                         index++;
                     }
                 }
-                if (!rews.getMcmmoSkills().isEmpty()) {
-                    for (final String s : rews.getMcmmoSkills()) {
+                if (!rewards.getMcmmoSkills().isEmpty()) {
+                    for (final String s : rewards.getMcmmoSkills()) {
                         quester.sendMessage("- " + ChatColor.DARK_GREEN
-                                + rews.getMcmmoAmounts().get(rews.getMcmmoSkills().indexOf(s)) + " " 
+                                + rewards.getMcmmoAmounts().get(rewards.getMcmmoSkills().indexOf(s)) + " "
                                 + ChatColor.DARK_PURPLE + s + " " + Lang.get(p, "experience"));
                     }
                 }
-                if (!rews.getHeroesClasses().isEmpty()) {
-                    for (final String s : rews.getHeroesClasses()) {
+                if (!rewards.getHeroesClasses().isEmpty()) {
+                    for (final String s : rewards.getHeroesClasses()) {
                         quester.sendMessage("- " + ChatColor.AQUA
-                                + rews.getHeroesAmounts().get(rews.getHeroesClasses().indexOf(s)) + " " + ChatColor.BLUE 
+                                + rewards.getHeroesAmounts().get(rewards.getHeroesClasses().indexOf(s)) + " " + ChatColor.BLUE
                                 + s + " " + Lang.get(p, "experience"));
                     }
                 }
-                if (rews.getPartiesExperience() > 0) {
-                    p.sendMessage("- " + ChatColor.DARK_GREEN + rews.getPartiesExperience() + ChatColor.DARK_PURPLE
+                if (rewards.getPartiesExperience() > 0) {
+                    p.sendMessage("- " + ChatColor.DARK_GREEN + rewards.getPartiesExperience() + ChatColor.DARK_PURPLE
                             + " " + Lang.get(p, "partiesExperience"));
                 }
                 if (!phatLootMessages.isEmpty()) {
@@ -933,7 +933,7 @@ public class Quest implements Comparable<Quest> {
                         quester.sendMessage("- " + s);
                     }
                 }
-                for (final String s : rews.getCustomRewards().keySet()) {
+                for (final String s : rewards.getCustomRewards().keySet()) {
                     CustomReward found = null;
                     for (final CustomReward cr : plugin.getCustomRewards()) {
                         if (cr.getName().equalsIgnoreCase(s)) {
@@ -942,18 +942,18 @@ public class Quest implements Comparable<Quest> {
                         }
                     }
                     if (found != null) {
-                        final Map<String, Object> datamap = rews.getCustomRewards().get(found.getName());
+                        final Map<String, Object> dataMap = rewards.getCustomRewards().get(found.getName());
                         String message = found.getDisplay();
                         if (message != null) {
-                            for (final String key : datamap.keySet()) {
-                                message = message.replace("%" + key + "%", datamap.get(key).toString());
+                            for (final String key : dataMap.keySet()) {
+                                message = message.replace("%" + key + "%", dataMap.get(key).toString());
                             }
                             quester.sendMessage("- " + ChatColor.GOLD + message);
                         } else {
                             plugin.getLogger().warning("Failed to notify player: " 
                                     + "Custom Reward does not have an assigned name");
                         }
-                        found.giveReward(p, rews.getCustomRewards().get(s));
+                        found.giveReward(p, rewards.getCustomRewards().get(s));
                     } else {
                         plugin.getLogger().warning("Quester \"" + player.getName() + "\" completed the Quest \""
                                 + name + "\", but the Custom Reward \"" + s
@@ -976,7 +976,7 @@ public class Quest implements Comparable<Quest> {
         }
         
         // Multiplayer
-        if (allowMultiplayer && opts.getShareProgressLevel() == 4) {
+        if (allowMultiplayer && options.getShareProgressLevel() == 4) {
             final List<Quester> mq = quester.getMultiplayerQuesters(this);
             for (final Quester qq : mq) {
                 if (qq.getQuestData(this) != null) {
@@ -999,7 +999,7 @@ public class Quest implements Comparable<Quest> {
      * Force player to quit quest and inform them of their failure
      * 
      * @param quester The quester to be ejected
-     * @param ignoreFailAction Whether or not to ignore quest fail Action
+     * @param ignoreFailAction Whether to ignore quest fail Action
      */
     @SuppressWarnings("deprecation")
     public void failQuest(final Quester quester, final boolean ignoreFailAction) {
diff --git a/main/src/main/java/me/blackvein/quests/QuestData.java b/main/src/main/java/me/blackvein/quests/QuestData.java
index 4e48aa9fd..fc460c318 100644
--- a/main/src/main/java/me/blackvein/quests/QuestData.java
+++ b/main/src/main/java/me/blackvein/quests/QuestData.java
@@ -1403,7 +1403,7 @@ public class QuestData {
         return sheepSheared;
     }
 
-    public void setSheepSheared(LinkedList<Integer> sheepSheared) {
+    public void setSheepSheared(final LinkedList<Integer> sheepSheared) {
         this.sheepSheared = sheepSheared;
         if (doJournalUpdate) {
             quester.updateJournal();
diff --git a/main/src/main/java/me/blackvein/quests/QuestFactory.java b/main/src/main/java/me/blackvein/quests/QuestFactory.java
index ef0d6ed71..52f8157e3 100644
--- a/main/src/main/java/me/blackvein/quests/QuestFactory.java
+++ b/main/src/main/java/me/blackvein/quests/QuestFactory.java
@@ -176,96 +176,96 @@ public class QuestFactory implements ConversationAbandonedListener {
         if (q.getGUIDisplay() != null) {
             context.setSessionData(CK.Q_GUIDISPLAY, q.getGUIDisplay());
         }
-        final Requirements reqs = q.getRequirements();
-        if (reqs.getMoney() != 0) {
-            context.setSessionData(CK.REQ_MONEY, reqs.getMoney());
+        final Requirements requirements = q.getRequirements();
+        if (requirements.getMoney() != 0) {
+            context.setSessionData(CK.REQ_MONEY, requirements.getMoney());
         }
-        if (reqs.getQuestPoints() != 0) {
-            context.setSessionData(CK.REQ_QUEST_POINTS, reqs.getQuestPoints());
+        if (requirements.getQuestPoints() != 0) {
+            context.setSessionData(CK.REQ_QUEST_POINTS, requirements.getQuestPoints());
         }
-        if (!reqs.getItems().isEmpty()) {
-            context.setSessionData(CK.REQ_ITEMS, reqs.getItems());
-            context.setSessionData(CK.REQ_ITEMS_REMOVE, reqs.getRemoveItems());
+        if (!requirements.getItems().isEmpty()) {
+            context.setSessionData(CK.REQ_ITEMS, requirements.getItems());
+            context.setSessionData(CK.REQ_ITEMS_REMOVE, requirements.getRemoveItems());
         }
-        if (!reqs.getNeededQuests().isEmpty()) {
-            final List<String> ids = reqs.getNeededQuests().stream().map(Quest::getId).collect(Collectors.toList());
+        if (!requirements.getNeededQuests().isEmpty()) {
+            final List<String> ids = requirements.getNeededQuests().stream().map(Quest::getId).collect(Collectors.toList());
             context.setSessionData(CK.REQ_QUEST, ids);
         }
-        if (!reqs.getBlockQuests().isEmpty()) {
-            final List<String> ids = reqs.getBlockQuests().stream().map(Quest::getId).collect(Collectors.toList());
+        if (!requirements.getBlockQuests().isEmpty()) {
+            final List<String> ids = requirements.getBlockQuests().stream().map(Quest::getId).collect(Collectors.toList());
             context.setSessionData(CK.REQ_QUEST_BLOCK, ids);
         }
-        if (!reqs.getMcmmoSkills().isEmpty()) {
-            context.setSessionData(CK.REQ_MCMMO_SKILLS, reqs.getMcmmoAmounts());
-            context.setSessionData(CK.REQ_MCMMO_SKILL_AMOUNTS, reqs.getMcmmoAmounts());
+        if (!requirements.getMcmmoSkills().isEmpty()) {
+            context.setSessionData(CK.REQ_MCMMO_SKILLS, requirements.getMcmmoAmounts());
+            context.setSessionData(CK.REQ_MCMMO_SKILL_AMOUNTS, requirements.getMcmmoAmounts());
         }
-        if (!reqs.getPermissions().isEmpty()) {
-            context.setSessionData(CK.REQ_PERMISSION, reqs.getPermissions());
+        if (!requirements.getPermissions().isEmpty()) {
+            context.setSessionData(CK.REQ_PERMISSION, requirements.getPermissions());
         }
-        if (reqs.getHeroesPrimaryClass() != null) {
-            context.setSessionData(CK.REQ_HEROES_PRIMARY_CLASS, reqs.getHeroesPrimaryClass());
+        if (requirements.getHeroesPrimaryClass() != null) {
+            context.setSessionData(CK.REQ_HEROES_PRIMARY_CLASS, requirements.getHeroesPrimaryClass());
         }
-        if (reqs.getHeroesSecondaryClass() != null) {
-            context.setSessionData(CK.REQ_HEROES_SECONDARY_CLASS, reqs.getHeroesSecondaryClass());
+        if (requirements.getHeroesSecondaryClass() != null) {
+            context.setSessionData(CK.REQ_HEROES_SECONDARY_CLASS, requirements.getHeroesSecondaryClass());
         }
-        if (!reqs.getCustomRequirements().isEmpty()) {
+        if (!requirements.getCustomRequirements().isEmpty()) {
             final LinkedList<String> list = new LinkedList<>();
-            final LinkedList<Map<String, Object>> datamapList = new LinkedList<>();
-            for (final Entry<String, Map<String, Object>> entry : reqs.getCustomRequirements().entrySet()) {
+            final LinkedList<Map<String, Object>> dataMapList = new LinkedList<>();
+            for (final Entry<String, Map<String, Object>> entry : requirements.getCustomRequirements().entrySet()) {
                 list.add(entry.getKey());
-                datamapList.add(entry.getValue());
+                dataMapList.add(entry.getValue());
             }
             context.setSessionData(CK.REQ_CUSTOM, list);
-            context.setSessionData(CK.REQ_CUSTOM_DATA, datamapList);
+            context.setSessionData(CK.REQ_CUSTOM_DATA, dataMapList);
         }
-        if (!reqs.getDetailsOverride().isEmpty()) {
-            context.setSessionData(CK.REQ_FAIL_MESSAGE, reqs.getDetailsOverride());
+        if (!requirements.getDetailsOverride().isEmpty()) {
+            context.setSessionData(CK.REQ_FAIL_MESSAGE, requirements.getDetailsOverride());
         }
-        final Rewards rews = q.getRewards();
-        if (rews.getMoney() != 0) {
-            context.setSessionData(CK.REW_MONEY, rews.getMoney());
+        final Rewards rewards = q.getRewards();
+        if (rewards.getMoney() != 0) {
+            context.setSessionData(CK.REW_MONEY, rewards.getMoney());
         }
-        if (rews.getQuestPoints() != 0) {
-            context.setSessionData(CK.REW_QUEST_POINTS, rews.getQuestPoints());
+        if (rewards.getQuestPoints() != 0) {
+            context.setSessionData(CK.REW_QUEST_POINTS, rewards.getQuestPoints());
         }
-        if (rews.getExp() != 0) {
-            context.setSessionData(CK.REW_EXP, rews.getExp());
+        if (rewards.getExp() != 0) {
+            context.setSessionData(CK.REW_EXP, rewards.getExp());
         }
-        if (!rews.getItems().isEmpty()) {
-            context.setSessionData(CK.REW_ITEMS, rews.getItems());
+        if (!rewards.getItems().isEmpty()) {
+            context.setSessionData(CK.REW_ITEMS, rewards.getItems());
         }
-        if (!rews.getCommands().isEmpty()) {
-            context.setSessionData(CK.REW_COMMAND, rews.getCommands());
+        if (!rewards.getCommands().isEmpty()) {
+            context.setSessionData(CK.REW_COMMAND, rewards.getCommands());
         }
-        if (!rews.getCommandsOverrideDisplay().isEmpty()) {
-            context.setSessionData(CK.REW_COMMAND_OVERRIDE_DISPLAY, rews.getCommandsOverrideDisplay());
+        if (!rewards.getCommandsOverrideDisplay().isEmpty()) {
+            context.setSessionData(CK.REW_COMMAND_OVERRIDE_DISPLAY, rewards.getCommandsOverrideDisplay());
         }
-        if (!rews.getPermissions().isEmpty()) {
-            context.setSessionData(CK.REW_PERMISSION, rews.getPermissions());
+        if (!rewards.getPermissions().isEmpty()) {
+            context.setSessionData(CK.REW_PERMISSION, rewards.getPermissions());
         }
-        if (!rews.getPermissions().isEmpty()) {
-            context.setSessionData(CK.REW_PERMISSION_WORLDS, rews.getPermissionWorlds());
+        if (!rewards.getPermissions().isEmpty()) {
+            context.setSessionData(CK.REW_PERMISSION_WORLDS, rewards.getPermissionWorlds());
         }
-        if (!rews.getMcmmoSkills().isEmpty()) {
-            context.setSessionData(CK.REW_MCMMO_SKILLS, rews.getMcmmoSkills());
-            context.setSessionData(CK.REW_MCMMO_AMOUNTS, rews.getMcmmoAmounts());
+        if (!rewards.getMcmmoSkills().isEmpty()) {
+            context.setSessionData(CK.REW_MCMMO_SKILLS, rewards.getMcmmoSkills());
+            context.setSessionData(CK.REW_MCMMO_AMOUNTS, rewards.getMcmmoAmounts());
         }
-        if (!rews.getHeroesClasses().isEmpty()) {
-            context.setSessionData(CK.REW_HEROES_CLASSES, rews.getHeroesClasses());
-            context.setSessionData(CK.REW_HEROES_AMOUNTS, rews.getHeroesAmounts());
+        if (!rewards.getHeroesClasses().isEmpty()) {
+            context.setSessionData(CK.REW_HEROES_CLASSES, rewards.getHeroesClasses());
+            context.setSessionData(CK.REW_HEROES_AMOUNTS, rewards.getHeroesAmounts());
         }
-        if (rews.getPartiesExperience() != 0) {
-            context.setSessionData(CK.REW_PARTIES_EXPERIENCE, rews.getPartiesExperience());
+        if (rewards.getPartiesExperience() != 0) {
+            context.setSessionData(CK.REW_PARTIES_EXPERIENCE, rewards.getPartiesExperience());
         }
-        if (!rews.getPhatLoots().isEmpty()) {
-            context.setSessionData(CK.REW_PHAT_LOOTS, rews.getPhatLoots());
+        if (!rewards.getPhatLoots().isEmpty()) {
+            context.setSessionData(CK.REW_PHAT_LOOTS, rewards.getPhatLoots());
         }
-        if (!rews.getCustomRewards().isEmpty()) {
-            context.setSessionData(CK.REW_CUSTOM, new LinkedList<>(rews.getCustomRewards().keySet()));
-            context.setSessionData(CK.REW_CUSTOM_DATA, new LinkedList<Object>(rews.getCustomRewards().values()));
+        if (!rewards.getCustomRewards().isEmpty()) {
+            context.setSessionData(CK.REW_CUSTOM, new LinkedList<>(rewards.getCustomRewards().keySet()));
+            context.setSessionData(CK.REW_CUSTOM_DATA, new LinkedList<Object>(rewards.getCustomRewards().values()));
         }
-        if (!rews.getDetailsOverride().isEmpty()) {
-            context.setSessionData(CK.REW_DETAILS_OVERRIDE, rews.getDetailsOverride());
+        if (!rewards.getDetailsOverride().isEmpty()) {
+            context.setSessionData(CK.REW_DETAILS_OVERRIDE, rewards.getDetailsOverride());
         }
         final Planner pln = q.getPlanner();
         if (pln.getStart() != null) {
@@ -299,68 +299,68 @@ public class QuestFactory implements ConversationAbandonedListener {
             context.setSessionData(pref, Boolean.TRUE);
             if (!stage.getBlocksToBreak().isEmpty()) {
                 final LinkedList<String> names = new LinkedList<>();
-                final LinkedList<Integer> amnts = new LinkedList<>();
-                final LinkedList<Short> durab = new LinkedList<>();
+                final LinkedList<Integer> amounts = new LinkedList<>();
+                final LinkedList<Short> durability = new LinkedList<>();
                 for (final ItemStack e : stage.getBlocksToBreak()) {
                     names.add(e.getType().name());
-                    amnts.add(e.getAmount());
-                    durab.add(e.getDurability());
+                    amounts.add(e.getAmount());
+                    durability.add(e.getDurability());
                 }
                 context.setSessionData(pref + CK.S_BREAK_NAMES, names);
-                context.setSessionData(pref + CK.S_BREAK_AMOUNTS, amnts);
-                context.setSessionData(pref + CK.S_BREAK_DURABILITY, durab);
+                context.setSessionData(pref + CK.S_BREAK_AMOUNTS, amounts);
+                context.setSessionData(pref + CK.S_BREAK_DURABILITY, durability);
             }
             if (!stage.getBlocksToDamage().isEmpty()) {
                 final LinkedList<String> names = new LinkedList<>();
-                final LinkedList<Integer> amnts = new LinkedList<>();
-                final LinkedList<Short> durab = new LinkedList<>();
+                final LinkedList<Integer> amounts = new LinkedList<>();
+                final LinkedList<Short> durability = new LinkedList<>();
                 for (final ItemStack e : stage.getBlocksToDamage()) {
                     names.add(e.getType().name());
-                    amnts.add(e.getAmount());
-                    durab.add(e.getDurability());
+                    amounts.add(e.getAmount());
+                    durability.add(e.getDurability());
                 }
                 context.setSessionData(pref + CK.S_DAMAGE_NAMES, names);
-                context.setSessionData(pref + CK.S_DAMAGE_AMOUNTS, amnts);
-                context.setSessionData(pref + CK.S_DAMAGE_DURABILITY, durab);
+                context.setSessionData(pref + CK.S_DAMAGE_AMOUNTS, amounts);
+                context.setSessionData(pref + CK.S_DAMAGE_DURABILITY, durability);
             }
             if (!stage.getBlocksToPlace().isEmpty()) {
                 final LinkedList<String> names = new LinkedList<>();
-                final LinkedList<Integer> amnts = new LinkedList<>();
-                final LinkedList<Short> durab = new LinkedList<>();
+                final LinkedList<Integer> amounts = new LinkedList<>();
+                final LinkedList<Short> durability = new LinkedList<>();
                 for (final ItemStack e : stage.getBlocksToPlace()) {
                     names.add(e.getType().name());
-                    amnts.add(e.getAmount());
-                    durab.add(e.getDurability());
+                    amounts.add(e.getAmount());
+                    durability.add(e.getDurability());
                 }
                 context.setSessionData(pref + CK.S_PLACE_NAMES, names);
-                context.setSessionData(pref + CK.S_PLACE_AMOUNTS, amnts);
-                context.setSessionData(pref + CK.S_PLACE_DURABILITY, durab);
+                context.setSessionData(pref + CK.S_PLACE_AMOUNTS, amounts);
+                context.setSessionData(pref + CK.S_PLACE_DURABILITY, durability);
             }
             if (!stage.getBlocksToUse().isEmpty()) {
                 final LinkedList<String> names = new LinkedList<>();
-                final LinkedList<Integer> amnts = new LinkedList<>();
-                final LinkedList<Short> durab = new LinkedList<>();
+                final LinkedList<Integer> amounts = new LinkedList<>();
+                final LinkedList<Short> durability = new LinkedList<>();
                 for (final ItemStack e : stage.getBlocksToUse()) {
                     names.add(e.getType().name());
-                    amnts.add(e.getAmount());
-                    durab.add(e.getDurability());
+                    amounts.add(e.getAmount());
+                    durability.add(e.getDurability());
                 }
                 context.setSessionData(pref + CK.S_USE_NAMES, names);
-                context.setSessionData(pref + CK.S_USE_AMOUNTS, amnts);
-                context.setSessionData(pref + CK.S_USE_DURABILITY, durab);
+                context.setSessionData(pref + CK.S_USE_AMOUNTS, amounts);
+                context.setSessionData(pref + CK.S_USE_DURABILITY, durability);
             }
             if (!stage.getBlocksToCut().isEmpty()) {
                 final LinkedList<String> names = new LinkedList<>();
-                final LinkedList<Integer> amnts = new LinkedList<>();
-                final LinkedList<Short> durab = new LinkedList<>();
+                final LinkedList<Integer> amounts = new LinkedList<>();
+                final LinkedList<Short> durability = new LinkedList<>();
                 for (final ItemStack e : stage.getBlocksToCut()) {
                     names.add(e.getType().name());
-                    amnts.add(e.getAmount());
-                    durab.add(e.getDurability());
+                    amounts.add(e.getAmount());
+                    durability.add(e.getDurability());
                 }
                 context.setSessionData(pref + CK.S_CUT_NAMES, names);
-                context.setSessionData(pref + CK.S_CUT_AMOUNTS, amnts);
-                context.setSessionData(pref + CK.S_CUT_DURABILITY, durab);
+                context.setSessionData(pref + CK.S_CUT_AMOUNTS, amounts);
+                context.setSessionData(pref + CK.S_CUT_DURABILITY, durability);
             }
             if (!stage.getItemsToCraft().isEmpty()) {
                 final LinkedList<ItemStack> items = new LinkedList<>(stage.getItemsToCraft());
@@ -415,21 +415,21 @@ public class QuestFactory implements ConversationAbandonedListener {
                 context.setSessionData(pref + CK.S_MOB_TYPES, mobs);
                 context.setSessionData(pref + CK.S_MOB_AMOUNTS, stage.getMobNumToKill());
                 if (!stage.getLocationsToKillWithin().isEmpty()) {
-                    final LinkedList<String> locs = new LinkedList<>();
+                    final LinkedList<String> locations = new LinkedList<>();
                     for (final Location l : stage.getLocationsToKillWithin()) {
-                        locs.add(ConfigUtil.getLocationInfo(l));
+                        locations.add(ConfigUtil.getLocationInfo(l));
                     }
-                    context.setSessionData(pref + CK.S_MOB_KILL_LOCATIONS, locs);
+                    context.setSessionData(pref + CK.S_MOB_KILL_LOCATIONS, locations);
                     context.setSessionData(pref + CK.S_MOB_KILL_LOCATIONS_RADIUS, stage.getRadiiToKillWithin());
                     context.setSessionData(pref + CK.S_MOB_KILL_LOCATIONS_NAMES, stage.getKillNames());
                 }
             }
             if (!stage.getLocationsToReach().isEmpty()) {
-                final LinkedList<String> locs = new LinkedList<>();
+                final LinkedList<String> locations = new LinkedList<>();
                 for (final Location l : stage.getLocationsToReach()) {
-                    locs.add(ConfigUtil.getLocationInfo(l));
+                    locations.add(ConfigUtil.getLocationInfo(l));
                 }
-                context.setSessionData(pref + CK.S_REACH_LOCATIONS, locs);
+                context.setSessionData(pref + CK.S_REACH_LOCATIONS, locations);
                 context.setSessionData(pref + CK.S_REACH_LOCATIONS_RADIUS, stage.getRadiiToReachWithin());
                 context.setSessionData(pref + CK.S_REACH_LOCATIONS_NAMES, stage.getLocationNames());
             }
@@ -438,9 +438,9 @@ public class QuestFactory implements ConversationAbandonedListener {
                 for (final EntityType e : stage.getMobsToTame()) {
                     mobs.add(MiscUtil.getPrettyMobName(e));
                 }
-                final LinkedList<Integer> amts = new LinkedList<>(stage.getMobNumToTame());
+                final LinkedList<Integer> amounts = new LinkedList<>(stage.getMobNumToTame());
                 context.setSessionData(pref + CK.S_TAME_TYPES, mobs);
-                context.setSessionData(pref + CK.S_TAME_AMOUNTS, amts);
+                context.setSessionData(pref + CK.S_TAME_AMOUNTS, amounts);
             }
             if (!stage.getSheepToShear().isEmpty()) {
                 final LinkedList<String> colors = new LinkedList<>();
@@ -448,9 +448,9 @@ public class QuestFactory implements ConversationAbandonedListener {
                     colors.add(MiscUtil.getPrettyDyeColorName(d));
 
                 }
-                final LinkedList<Integer> amts = new LinkedList<>(stage.sheepNumToShear);
+                final LinkedList<Integer> amounts = new LinkedList<>(stage.sheepNumToShear);
                 context.setSessionData(pref + CK.S_SHEAR_COLORS, colors);
-                context.setSessionData(pref + CK.S_SHEAR_AMOUNTS, amts);
+                context.setSessionData(pref + CK.S_SHEAR_AMOUNTS, amounts);
             }
             if (!stage.getPasswordDisplays().isEmpty()) {
                 context.setSessionData(pref + CK.S_PASSWORD_DISPLAYS, stage.getPasswordDisplays());
@@ -463,10 +463,10 @@ public class QuestFactory implements ConversationAbandonedListener {
                     list.add(stage.getCustomObjectives().get(i).getName());
                     countList.add(stage.getCustomObjectiveCounts().get(i));
                 }
-                final LinkedList<Entry<String, Object>> datamapList = new LinkedList<>(stage.getCustomObjectiveData());
+                final LinkedList<Entry<String, Object>> dataMapList = new LinkedList<>(stage.getCustomObjectiveData());
                 context.setSessionData(pref + CK.S_CUSTOM_OBJECTIVES, list);
                 context.setSessionData(pref + CK.S_CUSTOM_OBJECTIVES_COUNT, countList);
-                context.setSessionData(pref + CK.S_CUSTOM_OBJECTIVES_DATA, datamapList);
+                context.setSessionData(pref + CK.S_CUSTOM_OBJECTIVES_DATA, dataMapList);
             }
             if (stage.getStartAction() != null) {
                 context.setSessionData(pref + CK.S_START_EVENT, stage.getStartAction().getName());
@@ -619,44 +619,44 @@ public class QuestFactory implements ConversationAbandonedListener {
     
     @SuppressWarnings("unchecked")
     private void saveRequirements(final ConversationContext context, final ConfigurationSection section) {
-        final ConfigurationSection reqs = section.createSection("requirements");
-        reqs.set("money", context.getSessionData(CK.REQ_MONEY) != null 
+        final ConfigurationSection requirements = section.createSection("requirements");
+        requirements.set("money", context.getSessionData(CK.REQ_MONEY) != null
                 ? context.getSessionData(CK.REQ_MONEY) : null);
-        reqs.set("quest-points", context.getSessionData(CK.REQ_QUEST_POINTS) != null 
+        requirements.set("quest-points", context.getSessionData(CK.REQ_QUEST_POINTS) != null
                 ? context.getSessionData(CK.REQ_QUEST_POINTS) : null);
-        reqs.set("items", context.getSessionData(CK.REQ_ITEMS) != null 
+        requirements.set("items", context.getSessionData(CK.REQ_ITEMS) != null
                 ? context.getSessionData(CK.REQ_ITEMS) : null);
-        reqs.set("remove-items", context.getSessionData(CK.REQ_ITEMS_REMOVE) != null 
+        requirements.set("remove-items", context.getSessionData(CK.REQ_ITEMS_REMOVE) != null
                 ? context.getSessionData(CK.REQ_ITEMS_REMOVE) : null);
-        reqs.set("permissions", context.getSessionData(CK.REQ_PERMISSION) != null 
+        requirements.set("permissions", context.getSessionData(CK.REQ_PERMISSION) != null
                 ? context.getSessionData(CK.REQ_PERMISSION) : null);
-        reqs.set("quests", context.getSessionData(CK.REQ_QUEST) != null 
+        requirements.set("quests", context.getSessionData(CK.REQ_QUEST) != null
                 ? context.getSessionData(CK.REQ_QUEST) : null);
-        reqs.set("quest-blocks", context.getSessionData(CK.REQ_QUEST_BLOCK) != null 
+        requirements.set("quest-blocks", context.getSessionData(CK.REQ_QUEST_BLOCK) != null
                 ? context.getSessionData(CK.REQ_QUEST_BLOCK) : null);
-        reqs.set("mcmmo-skills", context.getSessionData(CK.REQ_MCMMO_SKILLS) != null 
+        requirements.set("mcmmo-skills", context.getSessionData(CK.REQ_MCMMO_SKILLS) != null
                 ? context.getSessionData(CK.REQ_MCMMO_SKILLS) : null);
-        reqs.set("mcmmo-amounts", context.getSessionData(CK.REQ_MCMMO_SKILL_AMOUNTS) != null 
+        requirements.set("mcmmo-amounts", context.getSessionData(CK.REQ_MCMMO_SKILL_AMOUNTS) != null
                 ? context.getSessionData(CK.REQ_MCMMO_SKILL_AMOUNTS) : null);
-        reqs.set("heroes-primary-class", context.getSessionData(CK.REQ_HEROES_PRIMARY_CLASS) != null 
+        requirements.set("heroes-primary-class", context.getSessionData(CK.REQ_HEROES_PRIMARY_CLASS) != null
                 ? context.getSessionData(CK.REQ_HEROES_PRIMARY_CLASS) : null);
-        reqs.set("heroes-secondary-class", context.getSessionData(CK.REQ_HEROES_SECONDARY_CLASS) != null 
+        requirements.set("heroes-secondary-class", context.getSessionData(CK.REQ_HEROES_SECONDARY_CLASS) != null
                 ? context.getSessionData(CK.REQ_HEROES_SECONDARY_CLASS) : null);
-        final LinkedList<String> customReqs = context.getSessionData(CK.REQ_CUSTOM) != null 
+        final LinkedList<String> customRequirements = context.getSessionData(CK.REQ_CUSTOM) != null
                 ? (LinkedList<String>) context.getSessionData(CK.REQ_CUSTOM) : null;
-        final LinkedList<Map<String, Object>> customReqsData = context.getSessionData(CK.REQ_CUSTOM_DATA) != null 
+        final LinkedList<Map<String, Object>> customRequirementsData = context.getSessionData(CK.REQ_CUSTOM_DATA) != null
                 ? (LinkedList<Map<String, Object>>) context.getSessionData(CK.REQ_CUSTOM_DATA) : null;
-        if (customReqs != null && customReqsData != null) {
-            final ConfigurationSection customReqsSec = reqs.createSection("custom-requirements");
-            for (int i = 0; i < customReqs.size(); i++) {
-                final ConfigurationSection customReqSec = customReqsSec.createSection("req" + (i + 1));
-                customReqSec.set("name", customReqs.get(i));
-                customReqSec.set("data", customReqsData.get(i));
+        if (customRequirements != null && customRequirementsData != null) {
+            final ConfigurationSection customRequirementsSec = requirements.createSection("custom-requirements");
+            for (int i = 0; i < customRequirements.size(); i++) {
+                final ConfigurationSection customReqSec = customRequirementsSec.createSection("req" + (i + 1));
+                customReqSec.set("name", customRequirements.get(i));
+                customReqSec.set("data", customRequirementsData.get(i));
             }
         }
-        reqs.set("fail-requirement-message", context.getSessionData(CK.REQ_FAIL_MESSAGE) != null 
+        requirements.set("fail-requirement-message", context.getSessionData(CK.REQ_FAIL_MESSAGE) != null
                 ? context.getSessionData(CK.REQ_FAIL_MESSAGE) : null);
-        if (reqs.getKeys(false).isEmpty()) {
+        if (requirements.getKeys(false).isEmpty()) {
             section.set("requirements", null);
         }
     }
@@ -755,23 +755,23 @@ public class QuestFactory implements ConversationAbandonedListener {
                     ? context.getSessionData(pref + CK.S_PASSWORD_DISPLAYS) : null);
             stage.set("password-phrases", context.getSessionData(pref + CK.S_PASSWORD_PHRASES) != null
                     ? context.getSessionData(pref + CK.S_PASSWORD_PHRASES) : null);
-            final LinkedList<String> customObjs = (LinkedList<String>) context.getSessionData(pref + CK.S_CUSTOM_OBJECTIVES);
+            final LinkedList<String> customObj = (LinkedList<String>) context.getSessionData(pref + CK.S_CUSTOM_OBJECTIVES);
             final LinkedList<Integer> customObjCounts 
                     = (LinkedList<Integer>) context.getSessionData(pref + CK.S_CUSTOM_OBJECTIVES_COUNT);
-            final LinkedList<Entry<String, Object>> customObjsData 
+            final LinkedList<Entry<String, Object>> customObjData
                     = (LinkedList<Entry<String, Object>>) context.getSessionData(pref + CK.S_CUSTOM_OBJECTIVES_DATA);
             if (context.getSessionData(pref + CK.S_CUSTOM_OBJECTIVES) != null) {
                 final ConfigurationSection sec = stage.createSection("custom-objectives");
-                if (customObjs == null || customObjCounts == null || customObjsData == null) {
+                if (customObj == null || customObjCounts == null || customObjData == null) {
                     continue;
                 }
-                for (int index = 0; index < customObjs.size(); index++) {
+                for (int index = 0; index < customObj.size(); index++) {
                     final ConfigurationSection sec2 = sec.createSection("custom" + (index + 1));
-                    sec2.set("name", customObjs.get(index));
+                    sec2.set("name", customObj.get(index));
                     sec2.set("count", customObjCounts.get(index));
                     CustomObjective found = null;
                     for (final CustomObjective co : plugin.getCustomObjectives()) {
-                        if (co.getName().equals(customObjs.get(index))) {
+                        if (co.getName().equals(customObj.get(index))) {
                             found = co;
                             break;
                         }
@@ -780,9 +780,9 @@ public class QuestFactory implements ConversationAbandonedListener {
                         continue;
                     }
                     final ConfigurationSection sec3 = sec2.createSection("data");
-                    for (final Entry<String, Object> datamap : found.getData()) {
-                        for (final Entry<String, Object> e : customObjsData) {
-                            if (e.getKey().equals(datamap.getKey())) {
+                    for (final Entry<String, Object> dataMap : found.getData()) {
+                        for (final Entry<String, Object> e : customObjData) {
+                            if (e.getKey().equals(dataMap.getKey())) {
                                 sec3.set(e.getKey(), e.getValue()); // if anything goes wrong it's probably here
                             }
                         }
@@ -834,50 +834,50 @@ public class QuestFactory implements ConversationAbandonedListener {
     
     @SuppressWarnings("unchecked")
     private void saveRewards(final ConversationContext context, final ConfigurationSection section) {
-        final ConfigurationSection rews = section.createSection("rewards");
-        rews.set("items", context.getSessionData(CK.REW_ITEMS) != null 
+        final ConfigurationSection rewards = section.createSection("rewards");
+        rewards.set("items", context.getSessionData(CK.REW_ITEMS) != null
                 ? context.getSessionData(CK.REW_ITEMS) : null);
-        rews.set("money", context.getSessionData(CK.REW_MONEY) != null 
+        rewards.set("money", context.getSessionData(CK.REW_MONEY) != null
                 ? context.getSessionData(CK.REW_MONEY) : null);
-        rews.set("quest-points", context.getSessionData(CK.REW_QUEST_POINTS) != null 
+        rewards.set("quest-points", context.getSessionData(CK.REW_QUEST_POINTS) != null
                 ? context.getSessionData(CK.REW_QUEST_POINTS) : null);
-        rews.set("exp", context.getSessionData(CK.REW_EXP) != null 
+        rewards.set("exp", context.getSessionData(CK.REW_EXP) != null
                 ? context.getSessionData(CK.REW_EXP) : null);
-        rews.set("commands", context.getSessionData(CK.REW_COMMAND) != null 
+        rewards.set("commands", context.getSessionData(CK.REW_COMMAND) != null
                 ? context.getSessionData(CK.REW_COMMAND) : null);
-        rews.set("commands-override-display", context.getSessionData(CK.REW_COMMAND_OVERRIDE_DISPLAY) != null 
+        rewards.set("commands-override-display", context.getSessionData(CK.REW_COMMAND_OVERRIDE_DISPLAY) != null
                 ? context.getSessionData(CK.REW_COMMAND_OVERRIDE_DISPLAY) : null);
-        rews.set("permissions", context.getSessionData(CK.REW_PERMISSION) != null 
+        rewards.set("permissions", context.getSessionData(CK.REW_PERMISSION) != null
                 ? context.getSessionData(CK.REW_PERMISSION) : null);
-        rews.set("permission-worlds", context.getSessionData(CK.REW_PERMISSION_WORLDS) != null 
+        rewards.set("permission-worlds", context.getSessionData(CK.REW_PERMISSION_WORLDS) != null
                 ? context.getSessionData(CK.REW_PERMISSION_WORLDS) : null);
-        rews.set("mcmmo-skills", context.getSessionData(CK.REW_MCMMO_SKILLS) != null 
+        rewards.set("mcmmo-skills", context.getSessionData(CK.REW_MCMMO_SKILLS) != null
                 ? context.getSessionData(CK.REW_MCMMO_SKILLS) : null);
-        rews.set("mcmmo-levels", context.getSessionData(CK.REW_MCMMO_AMOUNTS) != null 
+        rewards.set("mcmmo-levels", context.getSessionData(CK.REW_MCMMO_AMOUNTS) != null
                 ? context.getSessionData(CK.REW_MCMMO_AMOUNTS) : null);
-        rews.set("heroes-exp-classes", context.getSessionData(CK.REW_HEROES_CLASSES) != null 
+        rewards.set("heroes-exp-classes", context.getSessionData(CK.REW_HEROES_CLASSES) != null
                 ? context.getSessionData(CK.REW_HEROES_CLASSES) : null);
-        rews.set("heroes-exp-amounts", context.getSessionData(CK.REW_HEROES_AMOUNTS) != null 
+        rewards.set("heroes-exp-amounts", context.getSessionData(CK.REW_HEROES_AMOUNTS) != null
                 ? context.getSessionData(CK.REW_HEROES_AMOUNTS) : null);
-        rews.set("parties-experience", context.getSessionData(CK.REW_PARTIES_EXPERIENCE) != null
+        rewards.set("parties-experience", context.getSessionData(CK.REW_PARTIES_EXPERIENCE) != null
                 ? context.getSessionData(CK.REW_PARTIES_EXPERIENCE) : null);
-        rews.set("phat-loots", context.getSessionData(CK.REW_PHAT_LOOTS) != null 
+        rewards.set("phat-loots", context.getSessionData(CK.REW_PHAT_LOOTS) != null
                 ? context.getSessionData(CK.REW_PHAT_LOOTS) : null);
-        final LinkedList<String> customRews = context.getSessionData(CK.REW_CUSTOM) != null 
+        final LinkedList<String> customRewards = context.getSessionData(CK.REW_CUSTOM) != null
                 ? (LinkedList<String>) context.getSessionData(CK.REW_CUSTOM) : null;
-        final LinkedList<Map<String, Object>> customRewsData = context.getSessionData(CK.REW_CUSTOM_DATA) != null 
+        final LinkedList<Map<String, Object>> customRewardsData = context.getSessionData(CK.REW_CUSTOM_DATA) != null
                 ? (LinkedList<Map<String, Object>>) context.getSessionData(CK.REW_CUSTOM_DATA) : null;
-        if (customRews != null && customRewsData != null) {
-            final ConfigurationSection customRewsSec = rews.createSection("custom-rewards");
-            for (int i = 0; i < customRews.size(); i++) {
-                final ConfigurationSection customRewSec = customRewsSec.createSection("req" + (i + 1));
-                customRewSec.set("name", customRews.get(i));
-                customRewSec.set("data", customRewsData.get(i));
+        if (customRewards != null && customRewardsData != null) {
+            final ConfigurationSection customRewardsSec = rewards.createSection("custom-rewards");
+            for (int i = 0; i < customRewards.size(); i++) {
+                final ConfigurationSection customRewSec = customRewardsSec.createSection("req" + (i + 1));
+                customRewSec.set("name", customRewards.get(i));
+                customRewSec.set("data", customRewardsData.get(i));
             }
         }
-        rews.set("details-override", context.getSessionData(CK.REW_DETAILS_OVERRIDE) != null 
+        rewards.set("details-override", context.getSessionData(CK.REW_DETAILS_OVERRIDE) != null
                 ? context.getSessionData(CK.REW_DETAILS_OVERRIDE) : null);
-        if (rews.getKeys(false).isEmpty()) {
+        if (rewards.getKeys(false).isEmpty()) {
             section.set("rewards", null);
         }
     }
diff --git a/main/src/main/java/me/blackvein/quests/Quester.java b/main/src/main/java/me/blackvein/quests/Quester.java
index 41377223a..dc7af1f33 100644
--- a/main/src/main/java/me/blackvein/quests/Quester.java
+++ b/main/src/main/java/me/blackvein/quests/Quester.java
@@ -46,7 +46,6 @@ import org.bukkit.OfflinePlayer;
 import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.configuration.file.FileConfiguration;
 import org.bukkit.configuration.file.YamlConfiguration;
-import org.bukkit.conversations.Conversable;
 import org.bukkit.enchantments.Enchantment;
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Player;
@@ -57,6 +56,7 @@ import org.bukkit.inventory.ItemFlag;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.ItemMeta;
 import org.bukkit.material.Crops;
+import org.jetbrains.annotations.NotNull;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -87,20 +87,20 @@ public class Quester implements Comparable<Quester> {
     protected int questPoints = 0;
     private String compassTargetQuestId;
     private long lastNotifiedCondition = 0L;
-    protected ConcurrentHashMap<Integer, Quest> timers = new ConcurrentHashMap<Integer, Quest>();
+    protected ConcurrentHashMap<Integer, Quest> timers = new ConcurrentHashMap<>();
     protected ConcurrentHashMap<Quest, Integer> currentQuests = new ConcurrentHashMap<Quest, Integer>() {
 
         private static final long serialVersionUID = 6361484975823846780L;
 
         @Override
-        public Integer put(final Quest key, final Integer val) {
+        public Integer put(final @NotNull Quest key, final @NotNull Integer val) {
             final Integer data = super.put(key, val);
             updateJournal();
             return data;
         }
 
         @Override
-        public Integer remove(final Object key) {
+        public Integer remove(final @NotNull Object key) {
             final Integer i = super.remove(key);
             updateJournal();
             return i;
@@ -128,27 +128,14 @@ public class Quester implements Comparable<Quester> {
             updateJournal();
             return b;
         }
-
-        /*@Override
-        public void add(final int index, final Quest element) {
-            super.add(index, element);
-            updateJournal();
-        }*/
         
         @Override
-        public boolean addAll(final Collection<? extends Quest> c) {
+        public boolean addAll(final @NotNull Collection<? extends Quest> c) {
             final boolean b = super.addAll(c);
             updateJournal();
             return b;
         }
 
-        /*@Override
-        public boolean addAll(final int index, final Collection<? extends Quest> c) {
-            final boolean b = super.addAll(index, c);
-            updateJournal();
-            return b;
-        }*/
-
         @Override
         public void clear() {
             super.clear();
@@ -168,35 +155,21 @@ public class Quester implements Comparable<Quester> {
             updateJournal();
             return b;
         }
-
-        /*@Override
-        public Quest remove(final int index) {
-            final Quest s = super.remove(index);
-            updateJournal();
-            return s;
-        }
-
-        @Override
-        public Quest set(final int index, final Quest element) {
-            final Quest s = super.set(index, element);
-            updateJournal();
-            return s;
-        }*/
     };
-    protected ConcurrentHashMap<Quest, Long> completedTimes = new ConcurrentHashMap<Quest, Long>();
+    protected ConcurrentHashMap<Quest, Long> completedTimes = new ConcurrentHashMap<>();
     protected ConcurrentHashMap<Quest, Integer> amountsCompleted = new ConcurrentHashMap<Quest, Integer>() {
 
         private static final long serialVersionUID = 5475202358792520975L;
 
         @Override
-        public Integer put(final Quest key, final Integer val) {
+        public Integer put(final @NotNull Quest key, final @NotNull Integer val) {
             final Integer data = super.put(key, val);
             updateJournal();
             return data;
         }
 
         @Override
-        public Integer remove(final Object key) {
+        public Integer remove(final @NotNull Object key) {
             final Integer i = super.remove(key);
             updateJournal();
             return i;
@@ -219,14 +192,14 @@ public class Quester implements Comparable<Quester> {
         private static final long serialVersionUID = -4607112433003926066L;
 
         @Override
-        public QuestData put(final Quest key, final QuestData val) {
+        public QuestData put(final @NotNull Quest key, final @NotNull QuestData val) {
             final QuestData data = super.put(key, val);
             updateJournal();
             return data;
         }
 
         @Override
-        public QuestData remove(final Object key) {
+        public QuestData remove(final @NotNull Object key) {
             final QuestData data = super.remove(key);
             updateJournal();
             return data;
@@ -453,22 +426,22 @@ public class Quester implements Comparable<Quester> {
     /**
      * Start a quest for this Quester
      * 
-     * @param q The quest to start
-     * @param ignoreReqs Whether to ignore Requirements
+     * @param quest The quest to start
+     * @param ignoreRequirements Whether to ignore Requirements
      */
     @SuppressWarnings("deprecation")
-    public void takeQuest(final Quest q, final boolean ignoreReqs) {
-        if (q == null) {
+    public void takeQuest(final Quest quest, final boolean ignoreRequirements) {
+        if (quest == null) {
             return;
         }
-        final QuesterPreStartQuestEvent preEvent = new QuesterPreStartQuestEvent(this, q);
+        final QuesterPreStartQuestEvent preEvent = new QuesterPreStartQuestEvent(this, quest);
         plugin.getServer().getPluginManager().callEvent(preEvent);
         if (preEvent.isCancelled()) {
             return;
         }
         final OfflinePlayer offlinePlayer = getOfflinePlayer();
         if (offlinePlayer.isOnline()) {
-            final Planner pln = q.getPlanner();
+            final Planner pln = quest.getPlanner();
             final long currentTime = System.currentTimeMillis();
             final long start = pln.getStartInMillis(); // Start time in milliseconds since UTC epoch
             final long end = pln.getEndInMillis(); // End time in milliseconds since UTC epoch
@@ -477,7 +450,7 @@ public class Quester implements Comparable<Quester> {
             if (start != -1) {
                 if (currentTime < start) {
                     String early = Lang.get("plnTooEarly");
-                    early = early.replace("<quest>", ChatColor.AQUA + q.getName() + ChatColor.YELLOW);
+                    early = early.replace("<quest>", ChatColor.AQUA + quest.getName() + ChatColor.YELLOW);
                     early = early.replace("<time>", ChatColor.RED
                             + MiscUtil.getTime(start - currentTime) + ChatColor.YELLOW);
                     sendMessage(ChatColor.YELLOW + early);
@@ -487,7 +460,7 @@ public class Quester implements Comparable<Quester> {
             if (end != -1 && repeat == -1) {
                 if (currentTime > end) {
                     String late = Lang.get("plnTooLate");
-                    late = late.replace("<quest>", ChatColor.AQUA + q.getName() + ChatColor.RED);
+                    late = late.replace("<quest>", ChatColor.AQUA + quest.getName() + ChatColor.RED);
                     late = late.replace("<time>", ChatColor.DARK_PURPLE
                             + MiscUtil.getTime(currentTime - end) + ChatColor.RED);
                     sendMessage(ChatColor.RED + late);
@@ -509,8 +482,8 @@ public class Quester implements Comparable<Quester> {
                     
                     // Get last completed time
                     long completedTime = 0L;
-                    if (getCompletedTimes().containsKey(q)) {
-                        completedTime = getCompletedTimes().get(q);
+                    if (getCompletedTimes().containsKey(quest)) {
+                        completedTime = getCompletedTimes().get(quest);
                     }
                     long completedEnd = 0L;
                     
@@ -531,15 +504,16 @@ public class Quester implements Comparable<Quester> {
                     for (final Entry<Long, Long> startEnd : mostRecent.entrySet()) {
                         if (startEnd.getKey() <= currentTime && currentTime < startEnd.getValue()) {
                             active = true;
+                            break;
                         }
                     }
                     
                     // If quest is not active, or new period of activity should override player cooldown, inform user
-                    if (!active || (q.getPlanner().getOverride() && completedEnd > 0L
+                    if (!active || (quest.getPlanner().getOverride() && completedEnd > 0L
                             && currentTime < (completedEnd /*+ repeat*/))) {
                         if (getPlayer().isOnline()) {
                             final String early = Lang.get("plnTooEarly")
-                                .replace("<quest>", ChatColor.AQUA + q.getName() + ChatColor.YELLOW)
+                                .replace("<quest>", ChatColor.AQUA + quest.getName() + ChatColor.YELLOW)
                                 .replace("<time>", ChatColor.DARK_PURPLE
                                 + MiscUtil.getTime((completedEnd /*+ repeat*/) - currentTime) + ChatColor.YELLOW);
                             sendMessage(ChatColor.YELLOW + early);
@@ -549,146 +523,151 @@ public class Quester implements Comparable<Quester> {
                 }
             }
         }
-        if (q.testRequirements(offlinePlayer) || ignoreReqs) {
-            addEmptiesFor(q, 0);
+        if (quest.testRequirements(offlinePlayer) || ignoreRequirements) {
+            addEmptiesFor(quest, 0);
             try {
-                currentQuests.put(q, 0);
+                currentQuests.put(quest, 0);
                 if (plugin.getSettings().getConsoleLogging() > 1) {
-                    plugin.getLogger().info(getPlayer().getUniqueId() + " started quest " + q.getName());
+                    plugin.getLogger().info(getPlayer().getUniqueId() + " started quest " + quest.getName());
                 }
             } catch (final NullPointerException npe) {
-                plugin.getLogger().severe("Unable to add quest" + q.getName() + " for player " + offlinePlayer.getName()
+                plugin.getLogger().severe("Unable to add quest" + quest.getName() + " for player " + offlinePlayer.getName()
                         + ". Consider resetting player data or report on Github");
             }
-            final Stage stage = q.getStage(0);
-            if (!ignoreReqs) {
-                final Requirements reqs = q.getRequirements();
-                if (reqs.getMoney() > 0) {
+            final Stage stage = quest.getStage(0);
+            if (!ignoreRequirements) {
+                final Requirements requirements = quest.getRequirements();
+                if (requirements.getMoney() > 0) {
                     if (plugin.getDependencies().getVaultEconomy() != null) {
-                        plugin.getDependencies().getVaultEconomy().withdrawPlayer(getOfflinePlayer(), reqs.getMoney());
+                        plugin.getDependencies().getVaultEconomy().withdrawPlayer(getOfflinePlayer(), requirements.getMoney());
                     }
                 }
                 if (offlinePlayer.isOnline()) {
                     final Player p = getPlayer();
-                    final ItemStack[] original = p.getInventory().getContents().clone();
-                    for (final ItemStack is : reqs.getItems()) {
-                        if (reqs.getRemoveItems().get(reqs.getItems().indexOf(is))) {
-                            if (!InventoryUtil.removeItem(p.getInventory(), is)) {
-                                if (!InventoryUtil.stripItem(p.getEquipment(), is)) {
-                                    p.getInventory().setContents(original);
-                                    p.updateInventory();
-                                    sendMessage(Lang.get(p, "requirementsItemFail"));
-                                    hardQuit(q);
-                                    return;
+                    if (p != null) {
+                        final ItemStack[] original = p.getInventory().getContents().clone();
+                        for (final ItemStack is : requirements.getItems()) {
+                            if (requirements.getRemoveItems().get(requirements.getItems().indexOf(is))) {
+                                if (!InventoryUtil.removeItem(p.getInventory(), is)) {
+                                    if (p.getEquipment() != null && !InventoryUtil.stripItem(p.getEquipment(), is)) {
+                                        p.getInventory().setContents(original);
+                                        p.updateInventory();
+                                        sendMessage(Lang.get(p, "requirementsItemFail"));
+                                        hardQuit(quest);
+                                        return;
+                                    }
                                 }
                             }
                         }
-                    }
-                    String accepted = Lang.get(getPlayer(), "questAccepted");
-                    accepted = accepted.replace("<quest>", q.getName());
-                    sendMessage(ChatColor.GREEN + accepted);
-                    p.sendMessage("");
-                    if (plugin.getSettings().canShowQuestTitles()) {
-                        plugin.getServer().dispatchCommand(plugin.getServer().getConsoleSender(), "title " 
-                                + offlinePlayer.getName() + " title " + "{\"text\":\"" + Lang.get(getPlayer(), "quest")
-                                + " " + Lang.get(getPlayer(), "accepted") +  "\",\"color\":\"gold\"}");
-                        plugin.getServer().dispatchCommand(plugin.getServer().getConsoleSender(), "title " 
-                                + offlinePlayer.getName() + " subtitle " + "{\"text\":\"" + q.getName() 
-                                + "\",\"color\":\"yellow\"}");
+                        String accepted = Lang.get(p, "questAccepted");
+                        accepted = accepted.replace("<quest>", quest.getName());
+                        sendMessage(ChatColor.GREEN + accepted);
+                        p.sendMessage("");
+                        if (plugin.getSettings().canShowQuestTitles()) {
+                            plugin.getServer().dispatchCommand(plugin.getServer().getConsoleSender(), "title "
+                                    + offlinePlayer.getName() + " title " + "{\"text\":\"" + Lang.get(p, "quest")
+                                    + " " + Lang.get(p, "accepted") +  "\",\"color\":\"gold\"}");
+                            plugin.getServer().dispatchCommand(plugin.getServer().getConsoleSender(), "title "
+                                    + offlinePlayer.getName() + " subtitle " + "{\"text\":\"" + quest.getName()
+                                    + "\",\"color\":\"yellow\"}");
+                        }
                     }
                 }
             }
             if (offlinePlayer.isOnline()) {
                 final Player p = getPlayer();
-                final String title = Lang.get(p, "objectives").replace("<quest>", q.getName());
+                final String title = Lang.get(p, "objectives").replace("<quest>", quest.getName());
                 sendMessage(ChatColor.GOLD + title);
-                plugin.showObjectives(q, this, false);
+                plugin.showObjectives(quest, this, false);
                 final String stageStartMessage = stage.startMessage;
                 if (stageStartMessage != null) {
-                    p.sendMessage(ConfigUtil.parseStringWithPossibleLineBreaks(stageStartMessage, q, getPlayer()));
+                    p.sendMessage(ConfigUtil.parseStringWithPossibleLineBreaks(stageStartMessage, quest, getPlayer()));
                 }
                 final Condition c = stage.getCondition();
                 if (c != null) {
                     sendMessage(ChatColor.LIGHT_PURPLE + Lang.get("stageEditorConditions"));
                     if (!c.getEntitiesWhileRiding().isEmpty()) {
-                        String msg = "- " + Lang.get("conditionEditorRideEntity");
+                        final StringBuilder msg = new StringBuilder("- " + Lang.get("conditionEditorRideEntity"));
                         for (final String e : c.getEntitiesWhileRiding()) {
-                            msg += ChatColor.AQUA + "\n   \u2515 " + e;
+                            msg.append(ChatColor.AQUA).append("\n   \u2515 ").append(e);
                         }
-                        sendMessage(ChatColor.YELLOW + msg);
+                        sendMessage(ChatColor.YELLOW + msg.toString());
                     } else if (!c.getNpcsWhileRiding().isEmpty()) {
-                        String msg = "- " + Lang.get("conditionEditorRideNPC");
+                        final StringBuilder msg = new StringBuilder("- " + Lang.get("conditionEditorRideNPC"));
                         for (final int i : c.getNpcsWhileRiding()) {
                             if (plugin.getDependencies().getCitizens() != null) {
-                                msg += ChatColor.AQUA + "\n   \u2515 " + CitizensAPI.getNPCRegistry().getById(i)
-                                        .getName();
+                                msg.append(ChatColor.AQUA).append("\n   \u2515 ").append(CitizensAPI.getNPCRegistry()
+                                        .getById(i).getName());
                             } else {
-                                msg += ChatColor.AQUA + "\n   \u2515 " + i;
+                                msg.append(ChatColor.AQUA).append("\n   \u2515 ").append(i);
                             }
                         }
-                        sendMessage(ChatColor.YELLOW + msg);
+                        sendMessage(ChatColor.YELLOW + msg.toString());
                     } else if (!c.getPermissions().isEmpty()) {
-                        String msg = "- " + Lang.get("conditionEditorPermissions");
+                        final StringBuilder msg = new StringBuilder("- " + Lang.get("conditionEditorPermissions"));
                         for (final String e : c.getPermissions()) {
-                            msg += ChatColor.AQUA + "\n   \u2515 " + e;
+                            msg.append(ChatColor.AQUA).append("\n   \u2515 ").append(e);
                         }
-                        sendMessage(ChatColor.YELLOW + msg);
+                        sendMessage(ChatColor.YELLOW + msg.toString());
                     } else if (!c.getItemsWhileHoldingMainHand().isEmpty()) {
-                        String msg = "- " + Lang.get("conditionEditorItemsInMainHand");
+                        final StringBuilder msg = new StringBuilder("- " + Lang.get("conditionEditorItemsInMainHand"));
                         for (final ItemStack is : c.getItemsWhileHoldingMainHand()) {
-                            msg += ChatColor.AQUA + "\n   \u2515 " + ItemUtil.getPrettyItemName(is.getType().name());
+                            msg.append(ChatColor.AQUA).append("\n   \u2515 ").append(ItemUtil.getPrettyItemName(is
+                                    .getType().name()));
                         }
-                        sendMessage(ChatColor.YELLOW + msg);
+                        sendMessage(ChatColor.YELLOW + msg.toString());
                     } else if (!c.getWorldsWhileStayingWithin().isEmpty()) {
-                        String msg = "- " + Lang.get("conditionEditorStayWithinWorld");
+                        final StringBuilder msg = new StringBuilder("- " + Lang.get("conditionEditorStayWithinWorld"));
                         for (final String w : c.getWorldsWhileStayingWithin()) {
-                            msg += ChatColor.AQUA + "\n   \u2515 " + w;
+                            msg.append(ChatColor.AQUA).append("\n   \u2515 ").append(w);
                         }
-                        sendMessage(ChatColor.YELLOW + msg);
+                        sendMessage(ChatColor.YELLOW + msg.toString());
                     } else if (!c.getBiomesWhileStayingWithin().isEmpty()) {
-                        String msg = "- " + Lang.get("conditionEditorStayWithinBiome");
+                        final StringBuilder msg = new StringBuilder("- " + Lang.get("conditionEditorStayWithinBiome"));
                         for (final String b : c.getBiomesWhileStayingWithin()) {
-                            msg += ChatColor.AQUA + "\n   \u2515 " + MiscUtil.snakeCaseToUpperCamelCase(b);
+                            msg.append(ChatColor.AQUA).append("\n   \u2515 ").append(MiscUtil
+                                    .snakeCaseToUpperCamelCase(b));
                         }
-                        sendMessage(ChatColor.YELLOW + msg);
+                        sendMessage(ChatColor.YELLOW + msg.toString());
                     } else if (!c.getRegionsWhileStayingWithin().isEmpty()) {
-                        String msg = "- " + Lang.get("conditionEditorStayWithinRegion");
+                        final StringBuilder msg = new StringBuilder("- " + Lang.get("conditionEditorStayWithinRegion"));
                         for (final String r : c.getRegionsWhileStayingWithin()) {
-                            msg += ChatColor.AQUA + "\n   \u2515 " + r;
+                            msg.append(ChatColor.AQUA).append("\n   \u2515 ").append(r);
                         }
-                        sendMessage(ChatColor.YELLOW + msg);
+                        sendMessage(ChatColor.YELLOW + msg.toString());
                     } else if (!c.getPlaceholdersCheckIdentifier().isEmpty()) {
-                        String msg = "- " + Lang.get("conditionEditorCheckPlaceholder");
+                        final StringBuilder msg = new StringBuilder("- " + Lang.get("conditionEditorCheckPlaceholder"));
                         int index = 0;
                         for (final String r : c.getPlaceholdersCheckIdentifier()) {
                             if (c.getPlaceholdersCheckValue().size() > index) {
-                                msg += ChatColor.AQUA + "\n   \u2515 " + r + ChatColor.GRAY + " = " 
-                                        + ChatColor.AQUA + c.getPlaceholdersCheckValue().get(index);
+                                msg.append(ChatColor.AQUA).append("\n   \u2515 ").append(r).append(ChatColor.GRAY)
+                                        .append(" = ").append(ChatColor.AQUA).append(c.getPlaceholdersCheckValue()
+                                        .get(index));
                             }
                             index++;
                         }
-                        sendMessage(ChatColor.YELLOW + msg);
+                        sendMessage(ChatColor.YELLOW + msg.toString());
                     }
                 }
             }
-            if (q.initialAction != null) {
-                q.initialAction.fire(this, q);
+            if (quest.initialAction != null) {
+                quest.initialAction.fire(this, quest);
             }
             if (stage.startAction != null) {
-                stage.startAction.fire(this, q);
+                stage.startAction.fire(this, quest);
             }
-            q.updateCompass(this, stage);
+            quest.updateCompass(this, stage);
             saveData();
         } else {
             if (offlinePlayer.isOnline()) {
                 sendMessage(ChatColor.DARK_AQUA + Lang.get("requirements"));
-                for (final String s : getCurrentRequirements(q, false)) {
+                for (final String s : getCurrentRequirements(quest, false)) {
                     sendMessage(ChatColor.GRAY + "- " + s);
                 }
             }
         }
         if (offlinePlayer.isOnline()) {
-            final QuesterPostStartQuestEvent postEvent = new QuesterPostStartQuestEvent(this, q);
+            final QuesterPostStartQuestEvent postEvent = new QuesterPostStartQuestEvent(this, quest);
             plugin.getServer().getPluginManager().callEvent(postEvent);
         }
     }
@@ -725,52 +704,51 @@ public class Quester implements Comparable<Quester> {
             }
         }
         saveData();
-        //loadData();
         updateJournal();
     }
     
     public LinkedList<String> getCurrentRequirements(final Quest quest, final boolean ignoreOverrides) {
         if (quest == null) {
-            return new LinkedList<String>();
+            return new LinkedList<>();
         }
-        final Requirements reqs = quest.getRequirements();
+        final Requirements requirements = quest.getRequirements();
         if (!ignoreOverrides) {
-            if (reqs.getDetailsOverride() != null && !reqs.getDetailsOverride().isEmpty()) {
-                final LinkedList<String> requirements = new LinkedList<String>();
-                for (final String s : reqs.getDetailsOverride()) {
+            if (requirements.getDetailsOverride() != null && !requirements.getDetailsOverride().isEmpty()) {
+                final LinkedList<String> current = new LinkedList<>();
+                for (final String s : requirements.getDetailsOverride()) {
                     String message = ChatColor.RED + ConfigUtil.parseString(
                             ChatColor.translateAlternateColorCodes('&', s), quest, getPlayer());
                     if (plugin.getDependencies().getPlaceholderApi() != null) {
                         message = PlaceholderAPI.setPlaceholders(getPlayer(), message);
                     }
-                    requirements.add(message);
+                    current.add(message);
                     
                 }
-                return requirements;
+                return current;
             }
         }
-        final LinkedList<String> unfinishedRequirements = new LinkedList<String>();
-        final LinkedList<String> finishedRequirements = new LinkedList<String>();
-        final LinkedList<String> requirements = new LinkedList<String>();
+        final LinkedList<String> unfinishedRequirements = new LinkedList<>();
+        final LinkedList<String> finishedRequirements = new LinkedList<>();
+        final LinkedList<String> current = new LinkedList<>();
         final OfflinePlayer player = getPlayer();
-        if (reqs.getMoney() > 0) {
-            final String currency = plugin.getDependencies().getCurrency(reqs.getMoney() == 1 ? false : true);
+        if (requirements.getMoney() > 0) {
+            final String currency = plugin.getDependencies().getCurrency(requirements.getMoney() != 1);
             if (plugin.getDependencies().getVaultEconomy() != null
-                    && plugin.getDependencies().getVaultEconomy().getBalance(player) >= reqs.getMoney()) {
-                unfinishedRequirements.add(ChatColor.GREEN + "" + reqs.getMoney() + " " + currency);
+                    && plugin.getDependencies().getVaultEconomy().getBalance(player) >= requirements.getMoney()) {
+                unfinishedRequirements.add(ChatColor.GREEN + "" + requirements.getMoney() + " " + currency);
             } else {
-                finishedRequirements.add(ChatColor.GRAY + "" + reqs.getMoney() + " " + currency);
+                finishedRequirements.add(ChatColor.GRAY + "" + requirements.getMoney() + " " + currency);
             }
         }
-        if (reqs.getQuestPoints() > 0) {
-            if (getQuestPoints() >= reqs.getQuestPoints()) {
-                unfinishedRequirements.add(ChatColor.GREEN + "" + reqs.getQuestPoints() + " " 
+        if (requirements.getQuestPoints() > 0) {
+            if (getQuestPoints() >= requirements.getQuestPoints()) {
+                unfinishedRequirements.add(ChatColor.GREEN + "" + requirements.getQuestPoints() + " "
                         + Lang.get("questPoints"));
             } else {
-                finishedRequirements.add(ChatColor.GRAY + "" + reqs.getQuestPoints() + " " + Lang.get("questPoints"));
+                finishedRequirements.add(ChatColor.GRAY + "" + requirements.getQuestPoints() + " " + Lang.get("questPoints"));
             }
         }
-        for (final Quest q : reqs.getNeededQuests()) {
+        for (final Quest q : requirements.getNeededQuests()) {
             if (q != null) {
                 if (getCompletedQuests().contains(q)) {
                     finishedRequirements.add(ChatColor.GREEN + q.getName());
@@ -779,40 +757,40 @@ public class Quester implements Comparable<Quester> {
                 }
             }
         }
-        for (final Quest q : reqs.getBlockQuests()) {
+        for (final Quest q : requirements.getBlockQuests()) {
             if (q != null) {
                 if (completedQuests.contains(q) || currentQuests.containsKey(q)) {
-                    requirements.add(ChatColor.RED + quest.getName());
+                    current.add(ChatColor.RED + quest.getName());
                 }
             }
         }
-        for (final String s : reqs.getMcmmoSkills()) {
+        for (final String s : requirements.getMcmmoSkills()) {
             final SkillType st = Quests.getMcMMOSkill(s);
-            final int lvl = reqs.getMcmmoAmounts().get(reqs.getMcmmoSkills().indexOf(s));
+            final int lvl = requirements.getMcmmoAmounts().get(requirements.getMcmmoSkills().indexOf(s));
             if (UserManager.getOfflinePlayer(player).getProfile().getSkillLevel(st) >= lvl) {
                 finishedRequirements.add(ChatColor.GREEN + "" + lvl + " " + s);
             } else {
                 unfinishedRequirements.add(ChatColor.GRAY + "" + lvl + " " + s);
             }
         }
-        if (reqs.getHeroesPrimaryClass() != null) {
+        if (requirements.getHeroesPrimaryClass() != null) {
             if (plugin.getDependencies()
-                    .testPrimaryHeroesClass(reqs.getHeroesPrimaryClass(), player.getUniqueId())) {
+                    .testPrimaryHeroesClass(requirements.getHeroesPrimaryClass(), player.getUniqueId())) {
                 finishedRequirements.add(ChatColor.GREEN + Lang.get("reqHeroesPrimaryDisplay") + " " 
-                    + reqs.getHeroesPrimaryClass());
+                    + requirements.getHeroesPrimaryClass());
             } else {
                 unfinishedRequirements.add(ChatColor.GRAY + Lang.get("reqHeroesPrimaryDisplay") + " " 
-                        + reqs.getHeroesPrimaryClass());
+                        + requirements.getHeroesPrimaryClass());
             }
         }
-        if (reqs.getHeroesSecondaryClass() != null) {
+        if (requirements.getHeroesSecondaryClass() != null) {
             if (plugin.getDependencies()
-                    .testSecondaryHeroesClass(reqs.getHeroesSecondaryClass(), player.getUniqueId())) {
+                    .testSecondaryHeroesClass(requirements.getHeroesSecondaryClass(), player.getUniqueId())) {
                 finishedRequirements.add(ChatColor.GREEN + Lang.get("reqHeroesSecondaryDisplay") + " " 
-                        + reqs.getHeroesSecondaryClass());
+                        + requirements.getHeroesSecondaryClass());
             } else {
                 finishedRequirements.add(ChatColor.GRAY + Lang.get("reqHeroesSecondaryDisplay") + " " 
-                        + reqs.getHeroesSecondaryClass());
+                        + requirements.getHeroesSecondaryClass());
             }
         }
         if (player.isOnline()) {
@@ -820,7 +798,7 @@ public class Quester implements Comparable<Quester> {
             fakeInv.setContents(getPlayer().getInventory().getContents().clone());
             
             int num = 0;
-            for (final ItemStack is : reqs.getItems()) {
+            for (final ItemStack is : requirements.getItems()) {
                 if (InventoryUtil.canRemoveItem(fakeInv, is)) {
                     InventoryUtil.removeItem(fakeInv, is);
                     num += is.getAmount();
@@ -833,7 +811,7 @@ public class Quester implements Comparable<Quester> {
                 num = 0;
             }
             
-            for (final String perm :reqs.getPermissions()) {
+            for (final String perm :requirements.getPermissions()) {
                 if (getPlayer().hasPermission(perm)) {
                     finishedRequirements.add(ChatColor.GREEN + Lang.get("permissionDisplay") + " " + perm);
                 } else {
@@ -841,25 +819,23 @@ public class Quester implements Comparable<Quester> {
                 }
                 
             }
-            for (final Entry<String, Map<String, Object>> m : reqs.getCustomRequirements().entrySet()) {
+            for (final Entry<String, Map<String, Object>> m : requirements.getCustomRequirements().entrySet()) {
                 for (final CustomRequirement cr : plugin.getCustomRequirements()) {
                     if (cr.getName().equalsIgnoreCase(m.getKey())) {
-                        if (cr != null) {
-                            if (cr.testRequirement(getPlayer(), m.getValue())) {
-                                finishedRequirements.add(ChatColor.GREEN + "" 
-                                        + (cr.getDisplay() != null ? cr.getDisplay() : m.getKey()));
-                            } else {
-                                unfinishedRequirements.add(ChatColor.GRAY + "" 
-                                        + (cr.getDisplay() != null ? cr.getDisplay() : m.getKey()));
-                            }
+                        if (cr.testRequirement(getPlayer(), m.getValue())) {
+                            finishedRequirements.add(ChatColor.GREEN + ""
+                                    + (cr.getDisplay() != null ? cr.getDisplay() : m.getKey()));
+                        } else {
+                            unfinishedRequirements.add(ChatColor.GRAY + ""
+                                    + (cr.getDisplay() != null ? cr.getDisplay() : m.getKey()));
                         }
                     }
                 }
             } 
         }
-        requirements.addAll(unfinishedRequirements);
-        requirements.addAll(finishedRequirements);
-        return requirements;
+        current.addAll(unfinishedRequirements);
+        current.addAll(finishedRequirements);
+        return current;
     }
     
     /**
@@ -897,7 +873,7 @@ public class Quester implements Comparable<Quester> {
         }
         final QuestData data = getQuestData(quest);
         final Stage stage = getCurrentStage(quest);
-        final LinkedList<String> objectives = new LinkedList<String>();
+        final LinkedList<String> objectives = new LinkedList<>();
         for (final ItemStack e : stage.blocksToBreak) {
             for (final ItemStack e2 : data.blocksBroken) {
                 if (e2.getType().equals(e.getType()) && e2.getDurability() == e.getDurability()) {
@@ -1376,7 +1352,7 @@ public class Quester implements Comparable<Quester> {
         if (quest == null || getCurrentStage(quest) == null) {
             return false;
         }
-        for (CustomObjective co : getCurrentStage(quest).customObjectives) {
+        for (final CustomObjective co : getCurrentStage(quest).customObjectives) {
             if (co.getName().equals(name)) {
                 return true;
             }
@@ -1385,40 +1361,39 @@ public class Quester implements Comparable<Quester> {
     }
     
     /**
-     * Mark block as broken if Quester has such an objective
+     * Marks block as broken if Quester has such an objective
      * 
      * @param quest The quest for which the block is being broken
-     * @param m The block being broken
+     * @param itemStack The block being broken
      */
     @SuppressWarnings("deprecation")
-    public void breakBlock(final Quest quest, final ItemStack m) {
-        final ItemStack temp = m;
-        temp.setAmount(0);
-        ItemStack broken = temp;
-        ItemStack toBreak = temp;
+    public void breakBlock(final Quest quest, final ItemStack itemStack) {
+        itemStack.setAmount(0);
+        ItemStack broken = itemStack;
+        ItemStack toBreak = itemStack;
         for (final ItemStack is : getQuestData(quest).blocksBroken) {
-            if (m.getType() == is.getType()) {
-                if (m.getType().isSolid() && is.getType().isSolid()) {
+            if (itemStack.getType() == is.getType()) {
+                if (itemStack.getType().isSolid() && is.getType().isSolid()) {
                     // Blocks are solid so check for durability
-                    if (m.getDurability() == is.getDurability()) {
+                    if (itemStack.getDurability() == is.getDurability()) {
                         broken = is;
                     } else if (!plugin.getLocaleManager().isBelow113()) {
                         // Ignore durability for 1.13+
                         broken = is;
                     }
-                } else if (m.getData() instanceof Crops && is.getData() instanceof Crops) {
+                } else if (itemStack.getData() instanceof Crops && is.getData() instanceof Crops) {
                     if (is.getDurability() > 0) {
                         // Age is specified so check for durability
-                        if (m.getDurability() == is.getDurability()) {
+                        if (itemStack.getDurability() == is.getDurability()) {
                             broken = is;
                         }
                     } else {
                         // Age is unspecified so ignore durability
                         broken = is;
                     }
-                } else if (m.getType().name().equals("RED_ROSE")) {
+                } else if (itemStack.getType().name().equals("RED_ROSE")) {
                     // Flowers are unique so check for durability
-                    if (m.getDurability() == is.getDurability()) {
+                    if (itemStack.getDurability() == is.getDurability()) {
                         broken = is;
                     }
                 } else {
@@ -1428,28 +1403,28 @@ public class Quester implements Comparable<Quester> {
             }
         }
         for (final ItemStack is : getCurrentStage(quest).blocksToBreak) {
-            if (m.getType() == is.getType()) {
-                if (m.getType().isSolid() && is.getType().isSolid()) {
+            if (itemStack.getType() == is.getType()) {
+                if (itemStack.getType().isSolid() && is.getType().isSolid()) {
                     // Blocks are solid so check for durability
-                    if (m.getDurability() == is.getDurability()) {
+                    if (itemStack.getDurability() == is.getDurability()) {
                         toBreak = is;
                     } else if (!plugin.getLocaleManager().isBelow113()) {
                         // Ignore durability for 1.13+
                         toBreak = is;
                     }
-                } else if (m.getData() instanceof Crops && is.getData() instanceof Crops) {
+                } else if (itemStack.getData() instanceof Crops && is.getData() instanceof Crops) {
                     if (is.getDurability() > 0) {
                         // Age is specified so check for durability
-                        if (m.getDurability() == is.getDurability()) {
+                        if (itemStack.getDurability() == is.getDurability()) {
                             toBreak = is;
                         }
                     } else {
                         // Age is unspecified so ignore durability
                         toBreak = is;
                     }
-                } else if (m.getType().name().equals("RED_ROSE")) {
+                } else if (itemStack.getType().name().equals("RED_ROSE")) {
                     // Flowers are unique so check for durability
-                    if (m.getDurability() == is.getDurability()) {
+                    if (itemStack.getDurability() == is.getDurability()) {
                         toBreak = is;
                     }
                 } else {
@@ -1470,7 +1445,7 @@ public class Quester implements Comparable<Quester> {
             if (getQuestData(quest).blocksBroken.contains(broken)) {
                 getQuestData(quest).blocksBroken.set(getQuestData(quest).blocksBroken.indexOf(broken), newBroken);
                 if (broken.getAmount() == toBreak.getAmount()) {
-                    finishObjective(quest, new Objective(type, m, toBreak), null, null, null, null, null, null, null);
+                    finishObjective(quest, new Objective(type, itemStack, toBreak), null, null, null, null, null, null, null);
                     
                     // Multiplayer
                     final ItemStack finalBroken = broken;
@@ -1478,7 +1453,7 @@ public class Quester implements Comparable<Quester> {
                     dispatchMultiplayerObjectives(quest, getCurrentStage(quest), (final Quester q) -> {
                         q.getQuestData(quest).blocksBroken.set(getQuestData(quest).blocksBroken
                                 .indexOf(finalBroken), newBroken);
-                        q.finishObjective(quest, new Objective(type, m, finalToBreak), null, null, null, null, null,
+                        q.finishObjective(quest, new Objective(type, itemStack, finalToBreak), null, null, null, null, null,
                                 null, null);
                         return null;
                     });
@@ -1492,30 +1467,29 @@ public class Quester implements Comparable<Quester> {
     }
     
     /**
-     * Mark block as damaged if Quester has such an objective
+     * Marks block as damaged if Quester has such an objective
      * 
      * @param quest The quest for which the block is being damaged
-     * @param m The block being damaged
+     * @param itemStack The block being damaged
      */
     @SuppressWarnings("deprecation")
-    public void damageBlock(final Quest quest, final ItemStack m) {
-        final ItemStack temp = m;
-        temp.setAmount(0);
-        ItemStack damaged = temp;
-        ItemStack toDamage = temp;
+    public void damageBlock(final Quest quest, final ItemStack itemStack) {
+        itemStack.setAmount(0);
+        ItemStack damaged = itemStack;
+        ItemStack toDamage = itemStack;
         for (final ItemStack is : getQuestData(quest).blocksDamaged) {
-            if (m.getType() == is.getType()) {
-                if (m.getType().isSolid() && is.getType().isSolid()) {
+            if (itemStack.getType() == is.getType()) {
+                if (itemStack.getType().isSolid() && is.getType().isSolid()) {
                     // Blocks are solid so check for durability
-                    if (m.getDurability() == is.getDurability()) {
+                    if (itemStack.getDurability() == is.getDurability()) {
                         damaged = is;
                     } else if (!plugin.getLocaleManager().isBelow113()) {
                         // Ignore durability for 1.13+
                         damaged = is;
                     }
-                } else if (m.getType().name().equals("RED_ROSE")) {
+                } else if (itemStack.getType().name().equals("RED_ROSE")) {
                     // Flowers are unique so check for durability
-                    if (m.getDurability() == is.getDurability()) {
+                    if (itemStack.getDurability() == is.getDurability()) {
                         damaged = is;
                     }
                 } else {
@@ -1525,18 +1499,18 @@ public class Quester implements Comparable<Quester> {
             }
         }
         for (final ItemStack is : getCurrentStage(quest).blocksToDamage) {
-            if (m.getType() == is.getType()) {
-                if (m.getType().isSolid() && is.getType().isSolid()) {
+            if (itemStack.getType() == is.getType()) {
+                if (itemStack.getType().isSolid() && is.getType().isSolid()) {
                     // Blocks are solid so check for durability
-                    if (m.getDurability() == is.getDurability()) {
+                    if (itemStack.getDurability() == is.getDurability()) {
                         toDamage = is;
                     } else if (!plugin.getLocaleManager().isBelow113()) {
                         // Ignore durability for 1.13+
                         toDamage = is;
                     }
-                } else if (m.getType().name().equals("RED_ROSE")) {
+                } else if (itemStack.getType().name().equals("RED_ROSE")) {
                     // Flowers are unique so check for durability
-                    if (m.getDurability() == is.getDurability()) {
+                    if (itemStack.getDurability() == is.getDurability()) {
                         toDamage = is;
                     }
                 } else {
@@ -1558,7 +1532,7 @@ public class Quester implements Comparable<Quester> {
             if (getQuestData(quest).blocksDamaged.contains(damaged)) {
                 getQuestData(quest).blocksDamaged.set(getQuestData(quest).blocksDamaged.indexOf(damaged), newDamaged);
                 if (damaged.getAmount() == toDamage.getAmount()) {
-                    finishObjective(quest, new Objective(type, m, toDamage), null, null, null, null, null, null, null);
+                    finishObjective(quest, new Objective(type, itemStack, toDamage), null, null, null, null, null, null, null);
                     
                     // Multiplayer
                     final ItemStack finalDamaged = damaged;
@@ -1566,7 +1540,7 @@ public class Quester implements Comparable<Quester> {
                     dispatchMultiplayerObjectives(quest, getCurrentStage(quest), (final Quester q) -> {
                         q.getQuestData(quest).blocksDamaged.set(getQuestData(quest).blocksDamaged
                                 .indexOf(finalDamaged), newDamaged);
-                        q.finishObjective(quest, new Objective(type, m, finalToDamage), null, null, null, null, null,
+                        q.finishObjective(quest, new Objective(type, itemStack, finalToDamage), null, null, null, null, null,
                                 null, null);
                         return null;
                     });
@@ -1580,30 +1554,29 @@ public class Quester implements Comparable<Quester> {
     }
 
     /**
-     * Mark block as placed if Quester has such an objective
+     * Marks block as placed if Quester has such an objective
      * 
      * @param quest The quest for which the block is being placed
-     * @param m The block being placed
+     * @param itemStack The block being placed
      */
     @SuppressWarnings("deprecation")
-    public void placeBlock(final Quest quest, final ItemStack m) {
-        final ItemStack temp = m;
-        temp.setAmount(0);
-        ItemStack placed = temp;
-        ItemStack toPlace = temp;
+    public void placeBlock(final Quest quest, final ItemStack itemStack) {
+        itemStack.setAmount(0);
+        ItemStack placed = itemStack;
+        ItemStack toPlace = itemStack;
         for (final ItemStack is : getQuestData(quest).blocksPlaced) {
-            if (m.getType() == is.getType()) {
-                if (m.getType().isSolid() && is.getType().isSolid()) {
+            if (itemStack.getType() == is.getType()) {
+                if (itemStack.getType().isSolid() && is.getType().isSolid()) {
                     // Blocks are solid so check for durability
-                    if (m.getDurability() == is.getDurability()) {
+                    if (itemStack.getDurability() == is.getDurability()) {
                         placed = is;
                     } else if (!plugin.getLocaleManager().isBelow113()) {
                         // Ignore durability for 1.13+
                         placed = is;
                     }
-                } else if (m.getType().name().equals("RED_ROSE")) {
+                } else if (itemStack.getType().name().equals("RED_ROSE")) {
                     // Flowers are unique so check for durability
-                    if (m.getDurability() == is.getDurability()) {
+                    if (itemStack.getDurability() == is.getDurability()) {
                         placed = is;
                     }
                 } else {
@@ -1613,18 +1586,18 @@ public class Quester implements Comparable<Quester> {
             }
         }
         for (final ItemStack is : getCurrentStage(quest).blocksToPlace) {
-            if (m.getType() == is.getType()) {
-                if (m.getType().isSolid() && is.getType().isSolid()) {
+            if (itemStack.getType() == is.getType()) {
+                if (itemStack.getType().isSolid() && is.getType().isSolid()) {
                     // Blocks are solid so check for durability
-                    if (m.getDurability() == is.getDurability()) {
+                    if (itemStack.getDurability() == is.getDurability()) {
                         toPlace = is;
                     } else if (!plugin.getLocaleManager().isBelow113()) {
                         // Ignore durability for 1.13+
                         toPlace = is;
                     }
-                } else if (m.getType().name().equals("RED_ROSE")) {
+                } else if (itemStack.getType().name().equals("RED_ROSE")) {
                     // Flowers are unique so check for durability
-                    if (m.getDurability() == is.getDurability()) {
+                    if (itemStack.getDurability() == is.getDurability()) {
                         toPlace = is;
                     }
                 } else {
@@ -1645,7 +1618,7 @@ public class Quester implements Comparable<Quester> {
             if (getQuestData(quest).blocksPlaced.contains(placed)) {
                 getQuestData(quest).blocksPlaced.set(getQuestData(quest).blocksPlaced.indexOf(placed), newPlaced);
                 if (placed.getAmount() == toPlace.getAmount()) {
-                    finishObjective(quest, new Objective(type, m, toPlace), null, null, null, null, null, null, null);
+                    finishObjective(quest, new Objective(type, itemStack, toPlace), null, null, null, null, null, null, null);
                     
                     // Multiplayer
                     final ItemStack finalPlaced = placed;
@@ -1653,7 +1626,7 @@ public class Quester implements Comparable<Quester> {
                     dispatchMultiplayerObjectives(quest, getCurrentStage(quest), (final Quester q) -> {
                         q.getQuestData(quest).blocksPlaced.set(getQuestData(quest).blocksPlaced
                                 .indexOf(finalPlaced), newPlaced);
-                        q.finishObjective(quest, new Objective(type, m, finalToPlace), null, null, null, null, null,
+                        q.finishObjective(quest, new Objective(type, itemStack, finalToPlace), null, null, null, null, null,
                                 null, null);
                         return null;
                     });
@@ -1667,30 +1640,29 @@ public class Quester implements Comparable<Quester> {
     }
 
     /**
-     * Mark block as used if Quester has such an objective
+     * Marks block as used if Quester has such an objective
      * 
      * @param quest The quest for which the block is being used
-     * @param m The block being used
+     * @param itemStack The block being used
      */
     @SuppressWarnings("deprecation")
-    public void useBlock(final Quest quest, final ItemStack m) {
-        final ItemStack temp = m;
-        temp.setAmount(0);
-        ItemStack used = temp;
-        ItemStack toUse = temp;
+    public void useBlock(final Quest quest, final ItemStack itemStack) {
+        itemStack.setAmount(0);
+        ItemStack used = itemStack;
+        ItemStack toUse = itemStack;
         for (final ItemStack is : getQuestData(quest).blocksUsed) {
-            if (m.getType() == is.getType() ) {
-                if (m.getType().isSolid() && is.getType().isSolid()) {
+            if (itemStack.getType() == is.getType() ) {
+                if (itemStack.getType().isSolid() && is.getType().isSolid()) {
                     // Blocks are solid so check for durability
-                    if (m.getDurability() == is.getDurability()) {
+                    if (itemStack.getDurability() == is.getDurability()) {
                         used = is;
                     } else if (!plugin.getLocaleManager().isBelow113()) {
                         // Ignore durability for 1.13+
                         used = is;
                     }
-                } else if (m.getType().name().equals("RED_ROSE")) {
+                } else if (itemStack.getType().name().equals("RED_ROSE")) {
                     // Flowers are unique so check for durability
-                    if (m.getDurability() == is.getDurability()) {
+                    if (itemStack.getDurability() == is.getDurability()) {
                         used = is;
                     }
                 } else {
@@ -1700,18 +1672,18 @@ public class Quester implements Comparable<Quester> {
             }
         }
         for (final ItemStack is : getCurrentStage(quest).blocksToUse) {
-            if (m.getType() == is.getType() ) {
-                if (m.getType().isSolid() && is.getType().isSolid()) {
+            if (itemStack.getType() == is.getType() ) {
+                if (itemStack.getType().isSolid() && is.getType().isSolid()) {
                     // Blocks are solid, so check durability
-                    if (m.getDurability() == is.getDurability()) {
+                    if (itemStack.getDurability() == is.getDurability()) {
                         toUse = is;
                     } else if (!plugin.getLocaleManager().isBelow113()) {
                         // Ignore durability for 1.13+
                         toUse = is;
                     }
-                } else if (m.getType().name().equals("RED_ROSE")) {
+                } else if (itemStack.getType().name().equals("RED_ROSE")) {
                     // Flowers are unique so check for durability
-                    if (m.getDurability() == is.getDurability()) {
+                    if (itemStack.getDurability() == is.getDurability()) {
                         toUse = is;
                     }
                 } else {
@@ -1732,7 +1704,7 @@ public class Quester implements Comparable<Quester> {
             if (getQuestData(quest).blocksUsed.contains(used)) {
                 getQuestData(quest).blocksUsed.set(getQuestData(quest).blocksUsed.indexOf(used), newUsed);
                 if (used.getAmount() == toUse.getAmount()) {
-                    finishObjective(quest, new Objective(type, m, toUse), null, null, null, null, null, null, null);
+                    finishObjective(quest, new Objective(type, itemStack, toUse), null, null, null, null, null, null, null);
                     
                     // Multiplayer
                     final ItemStack finalUsed = used;
@@ -1740,7 +1712,7 @@ public class Quester implements Comparable<Quester> {
                     dispatchMultiplayerObjectives(quest, getCurrentStage(quest), (final Quester q) -> {
                         q.getQuestData(quest).blocksUsed.set(getQuestData(quest).blocksUsed
                                 .indexOf(finalUsed), newUsed);
-                        q.finishObjective(quest, new Objective(type, m, finalToUse), null, null, null, null, null, null,
+                        q.finishObjective(quest, new Objective(type, itemStack, finalToUse), null, null, null, null, null, null,
                                 null);
                         return null;
                     });
@@ -1754,30 +1726,29 @@ public class Quester implements Comparable<Quester> {
     }
 
     /**
-     * Mark block as cut if Quester has such an objective
+     * Marks block as cut if Quester has such an objective
      * 
      * @param quest The quest for which the block is being cut
-     * @param m The block being cut
+     * @param itemStack The block being cut
      */
     @SuppressWarnings("deprecation")
-    public void cutBlock(final Quest quest, final ItemStack m) {
-        final ItemStack temp = m;
-        temp.setAmount(0);
-        ItemStack cut = temp;
-        ItemStack toCut = temp;
+    public void cutBlock(final Quest quest, final ItemStack itemStack) {
+        itemStack.setAmount(0);
+        ItemStack cut = itemStack;
+        ItemStack toCut = itemStack;
         for (final ItemStack is : getQuestData(quest).blocksCut) {
-            if (m.getType() == is.getType()) {
-                if (m.getType().isSolid() && is.getType().isSolid()) {
+            if (itemStack.getType() == is.getType()) {
+                if (itemStack.getType().isSolid() && is.getType().isSolid()) {
                     // Blocks are solid so check for durability
-                    if (m.getDurability() == is.getDurability()) {
+                    if (itemStack.getDurability() == is.getDurability()) {
                         cut = is;
                     } else if (!plugin.getLocaleManager().isBelow113()) {
                         // Ignore durability for 1.13+
                         cut = is;
                     }
-                } else if (m.getType().name().equals("RED_ROSE")) {
+                } else if (itemStack.getType().name().equals("RED_ROSE")) {
                     // Flowers are unique so check for durability
-                    if (m.getDurability() == is.getDurability()) {
+                    if (itemStack.getDurability() == is.getDurability()) {
                         cut = is;
                     }
                 } else {
@@ -1787,18 +1758,18 @@ public class Quester implements Comparable<Quester> {
             }
         }
         for (final ItemStack is : getCurrentStage(quest).blocksToCut) {
-            if (m.getType() == is.getType()) {
-                if (m.getType().isSolid() && is.getType().isSolid()) {
+            if (itemStack.getType() == is.getType()) {
+                if (itemStack.getType().isSolid() && is.getType().isSolid()) {
                     // Blocks are solid so check for durability
-                    if (m.getDurability() == is.getDurability()) {
+                    if (itemStack.getDurability() == is.getDurability()) {
                         toCut = is;
                     } else if (!plugin.getLocaleManager().isBelow113()) {
                         // Ignore durability for 1.13+
                         toCut = is;
                     }
-                } else if (m.getType().name().equals("RED_ROSE")) {
+                } else if (itemStack.getType().name().equals("RED_ROSE")) {
                     // Flowers are unique so check for durability
-                    if (m.getDurability() == is.getDurability()) {
+                    if (itemStack.getDurability() == is.getDurability()) {
                         toCut = is;
                     }
                 } else {
@@ -1819,14 +1790,14 @@ public class Quester implements Comparable<Quester> {
             if (getQuestData(quest).blocksCut.contains(cut)) {
                 getQuestData(quest).blocksCut.set(getQuestData(quest).blocksCut.indexOf(cut), newCut);
                 if (cut.getAmount() == toCut.getAmount()) {
-                    finishObjective(quest, new Objective(type, m, toCut), null, null, null, null, null, null, null);
+                    finishObjective(quest, new Objective(type, itemStack, toCut), null, null, null, null, null, null, null);
                     
                     // Multiplayer
                     final ItemStack finalCut = cut;
                     final ItemStack finalToCut = toCut;
                     dispatchMultiplayerObjectives(quest, getCurrentStage(quest), (final Quester q) -> {
                         q.getQuestData(quest).blocksCut.set(getQuestData(quest).blocksCut.indexOf(finalCut), newCut);
-                        q.finishObjective(quest, new Objective(type, m, finalToCut), null, null, null, null, null, null,
+                        q.finishObjective(quest, new Objective(type, itemStack, finalToCut), null, null, null, null, null, null,
                                 null);
                         return null;
                     });
@@ -1843,14 +1814,14 @@ public class Quester implements Comparable<Quester> {
      * Mark item as crafted if Quester has such an objective
      * 
      * @param quest The quest for which the item is being crafted
-     * @param i The item being crafted
+     * @param itemStack The item being crafted
      */
-    public void craftItem(final Quest quest, final ItemStack i) {
+    public void craftItem(final Quest quest, final ItemStack itemStack) {
         int currentIndex = -1;
-        final LinkedList<Integer> matches = new LinkedList<Integer>();
+        final LinkedList<Integer> matches = new LinkedList<>();
         for (final ItemStack is : getQuestData(quest).itemsCrafted) {
             currentIndex++;
-            if (ItemUtil.compareItems(i, is, true) == 0) {
+            if (ItemUtil.compareItems(itemStack, is, true) == 0) {
                 matches.add(currentIndex);
             }
         }
@@ -1858,7 +1829,7 @@ public class Quester implements Comparable<Quester> {
             return;
         }
         for (final Integer match : matches) {
-            final LinkedList<ItemStack> items = new LinkedList<ItemStack>(getQuestData(quest).itemsCrafted);
+            final LinkedList<ItemStack> items = new LinkedList<>(getQuestData(quest).itemsCrafted);
             final ItemStack found = items.get(match);
             final int amount = found.getAmount();
             final int toCraft = getCurrentStage(quest).itemsToCraft.get(match).getAmount();
@@ -1868,27 +1839,25 @@ public class Quester implements Comparable<Quester> {
                     new Objective(type, amount, toCraft));
             plugin.getServer().getPluginManager().callEvent(preEvent);
 
-            final int newAmount = i.getAmount() + amount;
-            final Material m = i.getType();
+            final int newAmount = itemStack.getAmount() + amount;
+            final Material m = itemStack.getType();
             if (amount < toCraft) {
                 if (newAmount >= toCraft) {
-                    final ItemStack newStack = found;
                     found.setAmount(toCraft);
-                    getQuestData(quest).itemsCrafted.set(items.indexOf(found), newStack);
+                    getQuestData(quest).itemsCrafted.set(items.indexOf(found), found);
                     finishObjective(quest, new Objective(type, new ItemStack(m, 1), found), null, null, null, null,
                             null, null, null);
 
                     // Multiplayer
                     dispatchMultiplayerObjectives(quest, getCurrentStage(quest), (final Quester q) -> {
-                        q.getQuestData(quest).itemsCrafted.set(items.indexOf(found), newStack);
+                        q.getQuestData(quest).itemsCrafted.set(items.indexOf(found), found);
                         q.finishObjective(quest, new Objective(type, new ItemStack(m, 1), found), null, null, null,
                                 null, null, null, null);
                         return null;
                     });
                 } else {
-                    final ItemStack newStack = found;
                     found.setAmount(newAmount);
-                    getQuestData(quest).itemsCrafted.set(items.indexOf(found), newStack);
+                    getQuestData(quest).itemsCrafted.set(items.indexOf(found), found);
                 }
                 return;
             }
@@ -1903,14 +1872,14 @@ public class Quester implements Comparable<Quester> {
      * Mark item as smelted if Quester has such an objective
      * 
      * @param quest The quest for which the item is being smelted
-     * @param i The item being smelted
+     * @param itemStack The item being smelted
      */
-    public void smeltItem(final Quest quest, final ItemStack i) {
+    public void smeltItem(final Quest quest, final ItemStack itemStack) {
         int currentIndex = -1;
-        final LinkedList<Integer> matches = new LinkedList<Integer>();
+        final LinkedList<Integer> matches = new LinkedList<>();
         for (final ItemStack is : getQuestData(quest).itemsSmelted) {
             currentIndex++;
-            if (ItemUtil.compareItems(i, is, true) == 0) {
+            if (ItemUtil.compareItems(itemStack, is, true) == 0) {
                 matches.add(currentIndex);
             }
         }
@@ -1918,7 +1887,7 @@ public class Quester implements Comparable<Quester> {
             return;
         }
         for (final Integer match : matches) {
-            final LinkedList<ItemStack> items = new LinkedList<ItemStack>(getQuestData(quest).itemsSmelted);
+            final LinkedList<ItemStack> items = new LinkedList<>(getQuestData(quest).itemsSmelted);
             final ItemStack found = items.get(match);
             final int amount = found.getAmount();
             final int toSmelt = getCurrentStage(quest).itemsToSmelt.get(match).getAmount();
@@ -1928,27 +1897,25 @@ public class Quester implements Comparable<Quester> {
                     new Objective(type, amount, toSmelt));
             plugin.getServer().getPluginManager().callEvent(preEvent);
 
-            final int newAmount = i.getAmount() + amount;
-            final Material m = i.getType();
+            final int newAmount = itemStack.getAmount() + amount;
+            final Material m = itemStack.getType();
             if (amount < toSmelt) {
                 if (newAmount >= toSmelt) {
-                    final ItemStack newStack = found;
                     found.setAmount(toSmelt);
-                    getQuestData(quest).itemsSmelted.set(items.indexOf(found), newStack);
+                    getQuestData(quest).itemsSmelted.set(items.indexOf(found), found);
                     finishObjective(quest, new Objective(type, new ItemStack(m, 1), found), null, null, null, null,
                             null, null, null);
 
                     // Multiplayer
                     dispatchMultiplayerObjectives(quest, getCurrentStage(quest), (final Quester q) -> {
-                        q.getQuestData(quest).itemsSmelted.set(items.indexOf(found), newStack);
+                        q.getQuestData(quest).itemsSmelted.set(items.indexOf(found), found);
                         q.finishObjective(quest, new Objective(type, new ItemStack(m, 1), found), null, null, null,
                                 null, null, null, null);
                         return null;
                     });
                 } else {
-                    final ItemStack newStack = found;
                     found.setAmount(newAmount);
-                    getQuestData(quest).itemsSmelted.set(items.indexOf(found), newStack);
+                    getQuestData(quest).itemsSmelted.set(items.indexOf(found), found);
                 }
                 return;
             }
@@ -1963,19 +1930,19 @@ public class Quester implements Comparable<Quester> {
      * Mark item as enchanted if Quester has such an objective
      * 
      * @param quest The quest for which the item is being enchanted
-     * @param i The item being enchanted
+     * @param itemStack The item being enchanted
      */
-    public void enchantItem(final Quest quest, final ItemStack i) {
+    public void enchantItem(final Quest quest, final ItemStack itemStack) {
         int currentIndex = -1;
-        final LinkedList<Integer> matches = new LinkedList<Integer>();
+        final LinkedList<Integer> matches = new LinkedList<>();
         for (final ItemStack is : getQuestData(quest).itemsEnchanted) {
             currentIndex++;
             if (!is.getEnchantments().isEmpty()) {
-                if (ItemUtil.compareItems(i, is, true) == 0) {
+                if (ItemUtil.compareItems(itemStack, is, true) == 0) {
                     matches.add(currentIndex);
                 }
             } else {
-                if (ItemUtil.compareItems(i, is, true) == -4) {
+                if (ItemUtil.compareItems(itemStack, is, true) == -4) {
                     matches.add(currentIndex);
                 }
             }
@@ -1984,7 +1951,7 @@ public class Quester implements Comparable<Quester> {
             return;
         }
         for (final Integer match : matches) {
-            final LinkedList<ItemStack> items = new LinkedList<ItemStack>(getQuestData(quest).itemsEnchanted);
+            final LinkedList<ItemStack> items = new LinkedList<>(getQuestData(quest).itemsEnchanted);
             final ItemStack found = items.get(match);
             final int amount = found.getAmount();
             final int toEnchant = getCurrentStage(quest).itemsToEnchant.get(match).getAmount();
@@ -1994,33 +1961,31 @@ public class Quester implements Comparable<Quester> {
                     new Objective(type, amount, toEnchant));
             plugin.getServer().getPluginManager().callEvent(preEvent);
 
-            final int newAmount = i.getAmount() + amount;
-            final Material m = i.getType();
+            final int newAmount = itemStack.getAmount() + amount;
+            final Material m = itemStack.getType();
             if (amount < toEnchant) {
                 if (newAmount >= toEnchant) {
-                    final ItemStack newStack = found;
                     found.setAmount(toEnchant);
-                    getQuestData(quest).itemsEnchanted.set(items.indexOf(found), newStack);
+                    getQuestData(quest).itemsEnchanted.set(items.indexOf(found), found);
                     finishObjective(quest, new Objective(type, new ItemStack(m, 1), found), null, null, null, null,
                             null, null, null);
 
                     // Multiplayer
                     dispatchMultiplayerObjectives(quest, getCurrentStage(quest), (final Quester q) -> {
-                        q.getQuestData(quest).itemsEnchanted.set(items.indexOf(found), newStack);
+                        q.getQuestData(quest).itemsEnchanted.set(items.indexOf(found), found);
                         q.finishObjective(quest, new Objective(type, new ItemStack(m, 1), found), null, null, null,
                                 null, null, null, null);
                         return null;
                     });
                 } else {
-                    final ItemStack newStack = found;
                     found.setAmount(newAmount);
-                    getQuestData(quest).itemsEnchanted.set(items.indexOf(found), newStack);
+                    getQuestData(quest).itemsEnchanted.set(items.indexOf(found), found);
                 }
                 return;
             }
 
             final QuesterPostUpdateObjectiveEvent postEvent = new QuesterPostUpdateObjectiveEvent(this, quest,
-                    new Objective(type, i.getAmount() + amount, toEnchant));
+                    new Objective(type, itemStack.getAmount() + amount, toEnchant));
             plugin.getServer().getPluginManager().callEvent(postEvent);
         }
     }
@@ -2029,14 +1994,14 @@ public class Quester implements Comparable<Quester> {
      * Mark item as brewed if Quester has such an objective
      * 
      * @param quest The quest for which the item is being brewed
-     * @param i The item being brewed
+     * @param itemStack The item being brewed
      */
-    public void brewItem(final Quest quest, final ItemStack i) {
+    public void brewItem(final Quest quest, final ItemStack itemStack) {
         int currentIndex = -1;
-        final LinkedList<Integer> matches = new LinkedList<Integer>();
+        final LinkedList<Integer> matches = new LinkedList<>();
         for (final ItemStack is : getQuestData(quest).itemsBrewed) {
             currentIndex++;
-            if (ItemUtil.compareItems(i, is, true) == 0) {
+            if (ItemUtil.compareItems(itemStack, is, true) == 0) {
                 matches.add(currentIndex);
             }
         }
@@ -2044,7 +2009,7 @@ public class Quester implements Comparable<Quester> {
             return;
         }
         for (final Integer match : matches) {
-            final LinkedList<ItemStack> items = new LinkedList<ItemStack>(getQuestData(quest).itemsBrewed);
+            final LinkedList<ItemStack> items = new LinkedList<>(getQuestData(quest).itemsBrewed);
             final ItemStack found = items.get(match);
             final int amount = found.getAmount();
             final int toBrew = getCurrentStage(quest).itemsToBrew.get(match).getAmount();
@@ -2054,27 +2019,25 @@ public class Quester implements Comparable<Quester> {
                     new Objective(type, amount, toBrew));
             plugin.getServer().getPluginManager().callEvent(preEvent);
 
-            final int newAmount = i.getAmount() + amount;
-            final Material m = i.getType();
+            final int newAmount = itemStack.getAmount() + amount;
+            final Material m = itemStack.getType();
             if (amount < toBrew) {
                 if (newAmount >= toBrew) {
-                    final ItemStack newStack = found;
                     found.setAmount(toBrew);
-                    getQuestData(quest).itemsBrewed.set(items.indexOf(found), newStack);
+                    getQuestData(quest).itemsBrewed.set(items.indexOf(found), found);
                     finishObjective(quest, new Objective(type, new ItemStack(m, 1), found), null, null, null, null,
                             null, null, null);
 
                     // Multiplayer
                     dispatchMultiplayerObjectives(quest, getCurrentStage(quest), (final Quester q) -> {
-                        q.getQuestData(quest).itemsBrewed.set(items.indexOf(found), newStack);
+                        q.getQuestData(quest).itemsBrewed.set(items.indexOf(found), found);
                         q.finishObjective(quest, new Objective(type, new ItemStack(m, 1), found), null, null, null,
                                 null, null, null, null);
                         return null;
                     });
                 } else {
-                    final ItemStack newStack = found;
                     found.setAmount(newAmount);
-                    getQuestData(quest).itemsBrewed.set(items.indexOf(found), newStack);
+                    getQuestData(quest).itemsBrewed.set(items.indexOf(found), found);
                 }
                 return;
             }
@@ -2089,14 +2052,14 @@ public class Quester implements Comparable<Quester> {
      * Mark item as consumed if Quester has such an objective
      * 
      * @param quest The quest for which the item is being consumed
-     * @param i The item being consumed
+     * @param itemStack The item being consumed
      */
-    public void consumeItem(final Quest quest, final ItemStack i) {
+    public void consumeItem(final Quest quest, final ItemStack itemStack) {
         int currentIndex = -1;
-        final LinkedList<Integer> matches = new LinkedList<Integer>();
+        final LinkedList<Integer> matches = new LinkedList<>();
         for (final ItemStack is : getQuestData(quest).itemsConsumed) {
             currentIndex++;
-            if (ItemUtil.compareItems(i, is, true) == 0) {
+            if (ItemUtil.compareItems(itemStack, is, true) == 0) {
                 matches.add(currentIndex);
             }
         }
@@ -2104,7 +2067,7 @@ public class Quester implements Comparable<Quester> {
             return;
         }
         for (final Integer match : matches) {
-            final LinkedList<ItemStack> items = new LinkedList<ItemStack>(getQuestData(quest).itemsConsumed);
+            final LinkedList<ItemStack> items = new LinkedList<>(getQuestData(quest).itemsConsumed);
             final ItemStack found = items.get(match);
             final int amount = found.getAmount();
             final int toConsume = getCurrentStage(quest).itemsToConsume.get(match).getAmount();
@@ -2114,27 +2077,25 @@ public class Quester implements Comparable<Quester> {
                     new Objective(type, amount, toConsume));
             plugin.getServer().getPluginManager().callEvent(preEvent);
             
-            final int newAmount = i.getAmount() + amount;
-            final Material m = i.getType();
+            final int newAmount = itemStack.getAmount() + amount;
+            final Material m = itemStack.getType();
             if (amount < toConsume) {
                 if (newAmount >= toConsume) {
-                    final ItemStack newStack = found;
                     found.setAmount(toConsume);
-                    getQuestData(quest).itemsConsumed.set(items.indexOf(found), newStack);
+                    getQuestData(quest).itemsConsumed.set(items.indexOf(found), found);
                     finishObjective(quest, new Objective(type, new ItemStack(m, 1), found), null, null, null, null,
                             null, null, null);
                     
                     // Multiplayer
                     dispatchMultiplayerObjectives(quest, getCurrentStage(quest), (final Quester q) -> {
-                        q.getQuestData(quest).itemsConsumed.set(items.indexOf(found), newStack);
+                        q.getQuestData(quest).itemsConsumed.set(items.indexOf(found), found);
                         q.finishObjective(quest, new Objective(type, new ItemStack(m, 1), found), null, null, null,
                                 null, null, null, null);
                         return null;
                     });
                 } else {
-                    final ItemStack newStack = found;
                     found.setAmount(newAmount);
-                    getQuestData(quest).itemsConsumed.set(items.indexOf(found), newStack);
+                    getQuestData(quest).itemsConsumed.set(items.indexOf(found), found);
                 }
                 return;
             }
@@ -2149,20 +2110,20 @@ public class Quester implements Comparable<Quester> {
      * Mark item as delivered to a NPC if Quester has such an objective
      * 
      * @param quest The quest for which the item is being delivered
-     * @param n The NPC being delivered to
-     * @param i The item being delivered
+     * @param npc The NPC being delivered to
+     * @param itemStack The item being delivered
      */
     @SuppressWarnings("deprecation")
-    public void deliverToNPC(final Quest quest, final NPC n, final ItemStack i) {
-        if (n == null) {
+    public void deliverToNPC(final Quest quest, final NPC npc, final ItemStack itemStack) {
+        if (npc == null) {
             return;
         }
         
         int currentIndex = -1;
-        final LinkedList<Integer> matches = new LinkedList<Integer>();
+        final LinkedList<Integer> matches = new LinkedList<>();
         for (final ItemStack is : getQuestData(quest).itemsDelivered) {
             currentIndex++;
-            if (ItemUtil.compareItems(i, is, true) == 0) {
+            if (ItemUtil.compareItems(itemStack, is, true) == 0) {
                 matches.add(currentIndex);
             }
         }
@@ -2171,8 +2132,8 @@ public class Quester implements Comparable<Quester> {
         }
         final Player player = getPlayer();
         for (final Integer match : matches) {
-            final LinkedList<ItemStack> items = new LinkedList<ItemStack>(getQuestData(quest).itemsDelivered);
-            if (!getCurrentStage(quest).getItemDeliveryTargets().get(match).equals(n.getId())) {
+            final LinkedList<ItemStack> items = new LinkedList<>(getQuestData(quest).itemsDelivered);
+            if (!getCurrentStage(quest).getItemDeliveryTargets().get(match).equals(npc.getId())) {
                 continue;
             }
             final ItemStack found = items.get(match);
@@ -2184,22 +2145,21 @@ public class Quester implements Comparable<Quester> {
                     new Objective(type, amount, toDeliver));
             plugin.getServer().getPluginManager().callEvent(preEvent);
             
-            final int newAmount = i.getAmount() + amount;
-            final Material m = i.getType();
+            final int newAmount = itemStack.getAmount() + amount;
+            final Material m = itemStack.getType();
             if (amount < toDeliver) {
-                final int index = player.getInventory().first(i);
+                final int index = player.getInventory().first(itemStack);
                 if (index == -1) {
                     // Already delivered in previous loop
                     return;
                 }
                 if (newAmount >= toDeliver) {
-                    final ItemStack newStack = found;
                     found.setAmount(toDeliver);
-                    getQuestData(quest).itemsDelivered.set(items.indexOf(found), newStack);
-                    if ((i.getAmount() + amount) >= toDeliver) {
+                    getQuestData(quest).itemsDelivered.set(items.indexOf(found), found);
+                    if ((itemStack.getAmount() + amount) >= toDeliver) {
                         // Take away remaining amount to be delivered
-                        final ItemStack clone = i.clone();
-                        clone.setAmount(i.getAmount() - (toDeliver - amount));
+                        final ItemStack clone = itemStack.clone();
+                        clone.setAmount(itemStack.getAmount() - (toDeliver - amount));
                         player.getInventory().setItem(index, clone);
                     } else {
                         player.getInventory().setItem(index, null);
@@ -2210,15 +2170,14 @@ public class Quester implements Comparable<Quester> {
                     
                     // Multiplayer
                     dispatchMultiplayerObjectives(quest, getCurrentStage(quest), (final Quester q) -> {
-                        q.getQuestData(quest).itemsDelivered.set(items.indexOf(found), newStack);
+                        q.getQuestData(quest).itemsDelivered.set(items.indexOf(found), found);
                         q.finishObjective(quest, new Objective(type, new ItemStack(m, 1), found), null, null, null,
                                 null, null, null, null);
                         return null;
                     });
                 } else {
-                    final ItemStack newStack = found;
                     found.setAmount(newAmount);
-                    getQuestData(quest).itemsDelivered.set(items.indexOf(found), newStack);
+                    getQuestData(quest).itemsDelivered.set(items.indexOf(found), found);
                     player.getInventory().setItem(index, null);
                     player.updateInventory();
                     final String[] message = ConfigUtil.parseStringWithPossibleLineBreaks(getCurrentStage(quest)
@@ -2239,14 +2198,14 @@ public class Quester implements Comparable<Quester> {
      * Mark NPC as interacted with if Quester has such an objective
      * 
      * @param quest The quest for which the NPC is being interacted with
-     * @param n The NPC being interacted with
+     * @param npc The NPC being interacted with
      */
-    public void interactWithNPC(final Quest quest, final NPC n) {
-        if (!getCurrentStage(quest).getCitizensToInteract().contains(n.getId())) {
+    public void interactWithNPC(final Quest quest, final NPC npc) {
+        if (!getCurrentStage(quest).getCitizensToInteract().contains(npc.getId())) {
             return;
         }
 
-        final int index = getCurrentStage(quest).getCitizensToInteract().indexOf(n.getId());
+        final int index = getCurrentStage(quest).getCitizensToInteract().indexOf(npc.getId());
         final boolean npcsInteracted = getQuestData(quest).citizensInteracted.get(index);
 
         final ObjectiveType type = ObjectiveType.TALK_TO_NPC;
@@ -2257,13 +2216,13 @@ public class Quester implements Comparable<Quester> {
         if (!npcsInteracted) {
             getQuestData(quest).citizensInteracted.set(index, true);
             finishObjective(quest, new Objective(type, new ItemStack(Material.AIR, 1), new ItemStack(Material.AIR, 1)), 
-                    null, null, n, null, null, null, null);
+                    null, null, npc, null, null, null, null);
             
             // Multiplayer
             dispatchMultiplayerObjectives(quest, getCurrentStage(quest), (final Quester q) -> {
                 q.getQuestData(quest).citizensInteracted.set(index, true);
                 q.finishObjective(quest, new Objective(type, new ItemStack(Material.AIR, 1), 
-                        new ItemStack(Material.AIR, 1)), null, null, n, null, null, null, null);
+                        new ItemStack(Material.AIR, 1)), null, null, npc, null, null, null, null);
                 return null;
             });
             
@@ -2277,14 +2236,14 @@ public class Quester implements Comparable<Quester> {
      * Mark NPC as killed if the Quester has such an objective
      * 
      * @param quest The quest for which the NPC is being killed
-     * @param n The NPC being killed
+     * @param npc The NPC being killed
      */
-    public void killNPC(final Quest quest, final NPC n) {
-        if (!getQuestData(quest).citizensIdsKilled.contains(n.getId())) {
+    public void killNPC(final Quest quest, final NPC npc) {
+        if (!getQuestData(quest).citizensIdsKilled.contains(npc.getId())) {
             return;
         }
         
-        final int index = getQuestData(quest).citizensIdsKilled.indexOf(n.getId());
+        final int index = getQuestData(quest).citizensIdsKilled.indexOf(npc.getId());
         final int npcsKilled = getQuestData(quest).citizensNumKilled.get(index);
         final int npcsToKill = getCurrentStage(quest).citizenNumToKill.get(index);
         
@@ -2298,14 +2257,14 @@ public class Quester implements Comparable<Quester> {
             getQuestData(quest).citizensNumKilled.set(index, newNpcsKilled);
             if (newNpcsKilled >= npcsToKill) {
                 finishObjective(quest, new Objective(type, new ItemStack(Material.AIR, 1), 
-                        new ItemStack(Material.AIR, npcsToKill)), null, null, n, null, null, null, null);
+                        new ItemStack(Material.AIR, npcsToKill)), null, null, npc, null, null, null, null);
                 
                 // Multiplayer
                 dispatchMultiplayerObjectives(quest, getCurrentStage(quest), (final Quester q) -> {
                     q.getQuestData(quest).citizensNumKilled.set(index, getQuestData(quest).citizensNumKilled
                             .get(index));
                     q.finishObjective(quest, new Objective(type, new ItemStack(Material.AIR, 1), 
-                            new ItemStack(Material.AIR, npcsToKill)), null, null, n, null, null, null, null);
+                            new ItemStack(Material.AIR, npcsToKill)), null, null, npc, null, null, null, null);
                     return null;
                 });
             }
@@ -2317,7 +2276,7 @@ public class Quester implements Comparable<Quester> {
     }
     
     /**
-     * Mark cow as milked if Quester has such an objective
+     * Marks cow as milked if Quester has such an objective
      * 
      * @param quest The quest for which the fish is being caught
      */
@@ -2366,7 +2325,7 @@ public class Quester implements Comparable<Quester> {
     }
     
     /**
-     * Mark fish as caught if Quester has such an objective
+     * Marks fish as caught if Quester has such an objective
      * 
      * @param quest The quest for which the fish is being caught
      */
@@ -2419,11 +2378,11 @@ public class Quester implements Comparable<Quester> {
      * 
      * @param quest The quest for which the mob is being killed
      * @param killedLocation The optional location to kill at
-     * @param e The mob to be killed
+     * @param entityType The mob to be killed
      */
-    public void killMob(final Quest quest, final Location killedLocation, final EntityType e) {
+    public void killMob(final Quest quest, final Location killedLocation, final EntityType entityType) {
         final QuestData questData = getQuestData(quest);
-        if (e == null) {
+        if (entityType == null) {
             return;
         }
         final Stage currentStage = getCurrentStage(quest);
@@ -2431,7 +2390,7 @@ public class Quester implements Comparable<Quester> {
             return;
         }
         
-        final int index = questData.mobTypesKilled.indexOf(e);
+        final int index = questData.mobTypesKilled.indexOf(entityType);
         if (index == -1) {
             return;
         }
@@ -2470,13 +2429,13 @@ public class Quester implements Comparable<Quester> {
             questData.mobNumKilled.set(index, newMobsKilled);
             if (newMobsKilled >= mobsToKill) {
                 finishObjective(quest, new Objective(type, new ItemStack(Material.AIR, 1),
-                        new ItemStack(Material.AIR, mobsToKill)), e, null, null, null, null, null, null);
+                        new ItemStack(Material.AIR, mobsToKill)), entityType, null, null, null, null, null, null);
                 
                 // Multiplayer
                 dispatchMultiplayerObjectives(quest, currentStage, (final Quester q) -> {
                     q.getQuestData(quest).mobNumKilled.set(index, newMobsKilled);
                     q.finishObjective(quest, new Objective(type, new ItemStack(Material.AIR, 1),
-                            new ItemStack(Material.AIR, mobsToKill)), e, null, null, null, null, null, null);
+                            new ItemStack(Material.AIR, mobsToKill)), entityType, null, null, null, null, null, null);
                     return null;
                 });
             }
@@ -2549,13 +2508,13 @@ public class Quester implements Comparable<Quester> {
         }
 
         // TODO redo this
-        int locsReached = 0;
-        for (Boolean b : getQuestData(quest).locationsReached) {
+        int locationsReached = 0;
+        for (final Boolean b : getQuestData(quest).locationsReached) {
             if (b) {
-                locsReached++;
+                locationsReached++;
             }
         }
-        final int locsToReach = getCurrentStage(quest).locationsToReach.size();
+        final int locationsToReach = getCurrentStage(quest).locationsToReach.size();
 
         int index = 0;
         try {
@@ -2574,7 +2533,7 @@ public class Quester implements Comparable<Quester> {
                         final ObjectiveType type = ObjectiveType.REACH_LOCATION;
                         final QuesterPreUpdateObjectiveEvent preEvent 
                                 = new QuesterPreUpdateObjectiveEvent(this, quest, 
-                                new Objective(type, locsReached, locsToReach));
+                                new Objective(type, locationsReached, locationsToReach));
                         plugin.getServer().getPluginManager().callEvent(preEvent);
                         
                         getQuestData(quest).locationsReached.set(index, true);
@@ -2594,7 +2553,7 @@ public class Quester implements Comparable<Quester> {
                         
                         final QuesterPostUpdateObjectiveEvent postEvent 
                                 = new QuesterPostUpdateObjectiveEvent(this, quest, 
-                                new Objective(type, locsReached + 1, locsToReach));
+                                new Objective(type, locationsReached + 1, locationsToReach));
                         plugin.getServer().getPluginManager().callEvent(postEvent);
                         
                         break;
@@ -2687,7 +2646,7 @@ public class Quester implements Comparable<Quester> {
         }
 
         final int sheepToShear = getCurrentStage(quest).sheepNumToShear.get(index);
-        final int sheepSheared = getQuestData(quest).sheepSheared.get(index);
+        final int sheepSheared = questData.sheepSheared.get(index);
         
         final ObjectiveType type = ObjectiveType.SHEAR_SHEEP;
         final QuesterPreUpdateObjectiveEvent preEvent = new QuesterPreUpdateObjectiveEvent(this, quest, 
@@ -2735,7 +2694,7 @@ public class Quester implements Comparable<Quester> {
                     final String display = getCurrentStage(quest).passwordDisplays.get(index);
                     getQuestData(quest).passwordsSaid.set(index, true);
 
-                    int finalIndex = index;
+                    final int finalIndex = index;
                     plugin.getServer().getScheduler().runTask(plugin, () -> {
                         finishObjective(quest, new Objective(type, new ItemStack(Material.AIR, 1),
                                 new ItemStack(Material.AIR, 1)), null, null, null, null, null, display, null);
@@ -2810,7 +2769,7 @@ public class Quester implements Comparable<Quester> {
                 // Legacy
                 message += " <item>" + ChatColor.GREEN + ": " + goal.getAmount() + "/" + goal.getAmount();
             }
-            if (plugin.getSettings().canTranslateNames() && !goal.hasItemMeta() 
+            if (plugin.getSettings().canTranslateNames() && !goal.hasItemMeta()
                     && !goal.getItemMeta().hasDisplayName()) {
                 if (!plugin.getLocaleManager().sendMessage(p, message, increment.getType(), increment.getDurability(), null)) {
                     sendMessage(message.replace("<item>", ItemUtil.getName(increment)));
@@ -3124,14 +3083,12 @@ public class Quester implements Comparable<Quester> {
                     break;
                 }
             }
-            final List<Entry<String, Object>> sub = new LinkedList<>();
-            sub.addAll(getCurrentStage(quest).customObjectiveData.subList(index, getCurrentStage(quest)
+            final List<Entry<String, Object>> sub = new LinkedList<>(getCurrentStage(quest).customObjectiveData.subList(index, getCurrentStage(quest)
                     .customObjectiveData.size()));
-            final List<Entry<String, Object>> end = new LinkedList<Entry<String, Object>>(sub);
-            sub.clear(); // since sub is backed by end, this removes all sub-list items from end
-            for (final Entry<String, Object> datamap : end) {
-                message = message.replace("%" + (String.valueOf(datamap.getKey())) + "%", String.valueOf(datamap
-                        .getValue()));
+            final List<Entry<String, Object>> end = new LinkedList<>(sub);
+            sub.clear(); // Since sub is backed by end, this removes all sub-list items from end
+            for (final Entry<String, Object> dataMap : end) {
+                message = message.replace("%" + (dataMap.getKey()) + "%", String.valueOf(dataMap.getValue()));
             }
             
             if (co.canShowCount()) {
@@ -3225,9 +3182,9 @@ public class Quester implements Comparable<Quester> {
             return;
         }
         if (!quest.getStage(stage).blocksToBreak.isEmpty()) {
-            for (final ItemStack i : quest.getStage(stage).blocksToBreak) {
-                final ItemStack temp = new ItemStack(i.getType(), 0, i.getDurability());
-                if (data.blocksBroken.contains(i)) {
+            for (final ItemStack toBreak : quest.getStage(stage).blocksToBreak) {
+                final ItemStack temp = new ItemStack(toBreak.getType(), 0, toBreak.getDurability());
+                if (data.blocksBroken.contains(toBreak)) {
                     data.blocksBroken.set(data.blocksBroken.indexOf(temp), temp);
                 } else {
                     data.blocksBroken.add(temp);
@@ -3235,9 +3192,9 @@ public class Quester implements Comparable<Quester> {
             }
         }
         if (!quest.getStage(stage).blocksToDamage.isEmpty()) {
-            for (final ItemStack i : quest.getStage(stage).blocksToDamage) {
-                final ItemStack temp = new ItemStack(i.getType(), 0, i.getDurability());
-                if (data.blocksDamaged.contains(i)) {
+            for (final ItemStack toDamage : quest.getStage(stage).blocksToDamage) {
+                final ItemStack temp = new ItemStack(toDamage.getType(), 0, toDamage.getDurability());
+                if (data.blocksDamaged.contains(toDamage)) {
                     data.blocksDamaged.set(data.blocksDamaged.indexOf(temp), temp);
                 } else {
                     data.blocksDamaged.add(temp);
@@ -3245,9 +3202,9 @@ public class Quester implements Comparable<Quester> {
             }
         }
         if (!quest.getStage(stage).blocksToPlace.isEmpty()) {
-            for (final ItemStack i : quest.getStage(stage).blocksToPlace) {
-                final ItemStack temp = new ItemStack(i.getType(), 0, i.getDurability());
-                if (data.blocksPlaced.contains(i)) {
+            for (final ItemStack toPlace : quest.getStage(stage).blocksToPlace) {
+                final ItemStack temp = new ItemStack(toPlace.getType(), 0, toPlace.getDurability());
+                if (data.blocksPlaced.contains(toPlace)) {
                     data.blocksPlaced.set(data.blocksPlaced.indexOf(temp), temp);
                 } else {
                     data.blocksPlaced.add(temp);
@@ -3255,9 +3212,9 @@ public class Quester implements Comparable<Quester> {
             }
         }
         if (!quest.getStage(stage).blocksToUse.isEmpty()) {
-            for (final ItemStack i : quest.getStage(stage).blocksToUse) {
-                final ItemStack temp = new ItemStack(i.getType(), 0, i.getDurability());
-                if (data.blocksUsed.contains(i)) {
+            for (final ItemStack toUse : quest.getStage(stage).blocksToUse) {
+                final ItemStack temp = new ItemStack(toUse.getType(), 0, toUse.getDurability());
+                if (data.blocksUsed.contains(toUse)) {
                     data.blocksUsed.set(data.blocksUsed.indexOf(temp), temp);
                 } else {
                     data.blocksUsed.add(temp);
@@ -3265,9 +3222,9 @@ public class Quester implements Comparable<Quester> {
             }
         }
         if (!quest.getStage(stage).blocksToCut.isEmpty()) {
-            for (final ItemStack i : quest.getStage(stage).blocksToCut) {
-                final ItemStack temp = new ItemStack(i.getType(), 0, i.getDurability());
-                if (data.blocksCut.contains(i)) {
+            for (final ItemStack toCut : quest.getStage(stage).blocksToCut) {
+                final ItemStack temp = new ItemStack(toCut.getType(), 0, toCut.getDurability());
+                if (data.blocksCut.contains(toCut)) {
                     data.blocksCut.set(data.blocksCut.indexOf(temp), temp);
                 } else {
                     data.blocksCut.add(temp);
@@ -3275,67 +3232,67 @@ public class Quester implements Comparable<Quester> {
             }
         }
         if (!quest.getStage(stage).itemsToCraft.isEmpty()) {
-            for (final ItemStack i : quest.getStage(stage).itemsToCraft) {
-                final ItemStack temp = new ItemStack(i.getType(), 0, i.getDurability());
-                temp.addUnsafeEnchantments(i.getEnchantments());
-                temp.setItemMeta(i.getItemMeta());
+            for (final ItemStack toCraft : quest.getStage(stage).itemsToCraft) {
+                final ItemStack temp = new ItemStack(toCraft.getType(), 0, toCraft.getDurability());
+                temp.addUnsafeEnchantments(toCraft.getEnchantments());
+                temp.setItemMeta(toCraft.getItemMeta());
                 data.itemsCrafted.add(temp);
             }
         }
         if (!quest.getStage(stage).itemsToSmelt.isEmpty()) {
-            for (final ItemStack i : quest.getStage(stage).itemsToSmelt) {
-                final ItemStack temp = new ItemStack(i.getType(), 0, i.getDurability());
-                temp.addUnsafeEnchantments(i.getEnchantments());
-                temp.setItemMeta(i.getItemMeta());
+            for (final ItemStack toSmelt : quest.getStage(stage).itemsToSmelt) {
+                final ItemStack temp = new ItemStack(toSmelt.getType(), 0, toSmelt.getDurability());
+                temp.addUnsafeEnchantments(toSmelt.getEnchantments());
+                temp.setItemMeta(toSmelt.getItemMeta());
                 data.itemsSmelted.add(temp);
             }
         }
         if (!quest.getStage(stage).itemsToEnchant.isEmpty()) {
-            for (final ItemStack i : quest.getStage(stage).itemsToEnchant) {
-                final ItemStack temp = new ItemStack(i.getType(), 0, i.getDurability());
-                temp.addUnsafeEnchantments(i.getEnchantments());
-                temp.setItemMeta(i.getItemMeta());
+            for (final ItemStack toEnchant : quest.getStage(stage).itemsToEnchant) {
+                final ItemStack temp = new ItemStack(toEnchant.getType(), 0, toEnchant.getDurability());
+                temp.addUnsafeEnchantments(toEnchant.getEnchantments());
+                temp.setItemMeta(toEnchant.getItemMeta());
                 data.itemsEnchanted.add(temp);
             }
         }
         if (!quest.getStage(stage).itemsToBrew.isEmpty()) {
-            for (final ItemStack i : quest.getStage(stage).itemsToBrew) {
-                final ItemStack temp = new ItemStack(i.getType(), 0, i.getDurability());
-                temp.addUnsafeEnchantments(i.getEnchantments());
-                temp.setItemMeta(i.getItemMeta());
+            for (final ItemStack toBrew : quest.getStage(stage).itemsToBrew) {
+                final ItemStack temp = new ItemStack(toBrew.getType(), 0, toBrew.getDurability());
+                temp.addUnsafeEnchantments(toBrew.getEnchantments());
+                temp.setItemMeta(toBrew.getItemMeta());
                 data.itemsBrewed.add(temp);
             }
         }
         if (!quest.getStage(stage).itemsToConsume.isEmpty()) {
-            for (final ItemStack i : quest.getStage(stage).itemsToConsume) {
-                final ItemStack temp = new ItemStack(i.getType(), 0, i.getDurability());
-                temp.addUnsafeEnchantments(i.getEnchantments());
-                temp.setItemMeta(i.getItemMeta());
+            for (final ItemStack toConsume : quest.getStage(stage).itemsToConsume) {
+                final ItemStack temp = new ItemStack(toConsume.getType(), 0, toConsume.getDurability());
+                temp.addUnsafeEnchantments(toConsume.getEnchantments());
+                temp.setItemMeta(toConsume.getItemMeta());
                 data.itemsConsumed.add(temp);
             }
         }
         if (!quest.getStage(stage).itemsToDeliver.isEmpty()) {
-            for (final ItemStack i : quest.getStage(stage).itemsToDeliver) {
-                final ItemStack temp = new ItemStack(i.getType(), 0, i.getDurability());
-                temp.addUnsafeEnchantments(i.getEnchantments());
-                temp.setItemMeta(i.getItemMeta());
+            for (final ItemStack toDeliver : quest.getStage(stage).itemsToDeliver) {
+                final ItemStack temp = new ItemStack(toDeliver.getType(), 0, toDeliver.getDurability());
+                temp.addUnsafeEnchantments(toDeliver.getEnchantments());
+                temp.setItemMeta(toDeliver.getItemMeta());
                 data.itemsDelivered.add(temp);
             }
         }
         if (!quest.getStage(stage).citizensToInteract.isEmpty()) {
-            for (final Integer n : quest.getStage(stage).citizensToInteract) {
+            for (final Integer ignored : quest.getStage(stage).citizensToInteract) {
                 data.citizensInteracted.add(false);
             }
         }
         if (!quest.getStage(stage).citizensToKill.isEmpty()) {
-            for (final Integer n : quest.getStage(stage).citizensToKill) {
-                data.citizensIdsKilled.add(n);
+            for (final Integer toKill : quest.getStage(stage).citizensToKill) {
+                data.citizensIdsKilled.add(toKill);
                 data.citizensNumKilled.add(0);
             }
         }
         if (!quest.getStage(stage).mobsToKill.isEmpty()) {
-            for (final EntityType e : quest.getStage(stage).mobsToKill) {
-                data.mobTypesKilled.add(e);
+            for (final EntityType toKill : quest.getStage(stage).mobsToKill) {
+                data.mobTypesKilled.add(toKill);
                 data.mobNumKilled.add(0);
             }
         }
@@ -3388,14 +3345,14 @@ public class Quester implements Comparable<Quester> {
     }
     
     /**
-     * Get the difference between Sytem.currentTimeMillis() and the last completed time for a quest
+     * Get the difference between System.currentTimeMillis() and the last completed time for a quest
      * 
      * @param quest The quest to get the last completed time of
      * @return Difference between now and then in milliseconds
      */
     public long getCompletionDifference(final Quest quest) {
         final long currentTime = System.currentTimeMillis();
-        long lastTime;
+        final long lastTime;
         if (!completedTimes.containsKey(quest)) {
             lastTime = System.currentTimeMillis();
             completedTimes.put(quest, System.currentTimeMillis());
@@ -3427,12 +3384,11 @@ public class Quester implements Comparable<Quester> {
         return quest.getPlanner().getCooldown() - getCompletionDifference(quest);
     }
 
-    @SuppressWarnings("deprecation")
     public FileConfiguration getBaseData() {
         final FileConfiguration data = new YamlConfiguration();
         if (!currentQuests.isEmpty()) {
-            final ArrayList<String> questIds = new ArrayList<String>();
-            final ArrayList<Integer> questStages = new ArrayList<Integer>();
+            final ArrayList<String> questIds = new ArrayList<>();
+            final ArrayList<Integer> questStages = new ArrayList<>();
             for (final Quest quest : currentQuests.keySet()) {
                 questIds.add(quest.getId());
                 questStages.add(currentQuests.get(quest));
@@ -3452,77 +3408,77 @@ public class Quester implements Comparable<Quester> {
                     continue;
                 }
                 if (!questData.blocksBroken.isEmpty()) {
-                    final LinkedList<Integer> blockAmounts = new LinkedList<Integer>();
+                    final LinkedList<Integer> blockAmounts = new LinkedList<>();
                     for (final ItemStack m : questData.blocksBroken) {
                         blockAmounts.add(m.getAmount());
                     }
                     questSec.set("blocks-broken-amounts", blockAmounts);
                 }
                 if (!questData.blocksDamaged.isEmpty()) {
-                    final LinkedList<Integer> blockAmounts = new LinkedList<Integer>();
+                    final LinkedList<Integer> blockAmounts = new LinkedList<>();
                     for (final ItemStack m : questData.blocksDamaged) {
                         blockAmounts.add(m.getAmount());
                     }
                     questSec.set("blocks-damaged-amounts", blockAmounts);
                 }
                 if (!questData.blocksPlaced.isEmpty()) {
-                    final LinkedList<Integer> blockAmounts = new LinkedList<Integer>();
+                    final LinkedList<Integer> blockAmounts = new LinkedList<>();
                     for (final ItemStack m : questData.blocksPlaced) {
                         blockAmounts.add(m.getAmount());
                     }
                     questSec.set("blocks-placed-amounts", blockAmounts);
                 }
                 if (!questData.blocksUsed.isEmpty()) {
-                    final LinkedList<Integer> blockAmounts = new LinkedList<Integer>();
+                    final LinkedList<Integer> blockAmounts = new LinkedList<>();
                     for (final ItemStack m : questData.blocksUsed) {
                         blockAmounts.add(m.getAmount());
                     }
                     questSec.set("blocks-used-amounts", blockAmounts);
                 }
                 if (!questData.blocksCut.isEmpty()) {
-                    final LinkedList<Integer> blockAmounts = new LinkedList<Integer>();
+                    final LinkedList<Integer> blockAmounts = new LinkedList<>();
                     for (final ItemStack m : questData.blocksCut) {
                         blockAmounts.add(m.getAmount());
                     }
                     questSec.set("blocks-cut-amounts", blockAmounts);
                 }
                 if (!questData.itemsCrafted.isEmpty()) {
-                    final LinkedList<Integer> craftAmounts = new LinkedList<Integer>();
+                    final LinkedList<Integer> craftAmounts = new LinkedList<>();
                     for (final ItemStack m : questData.itemsCrafted) {
                         craftAmounts.add(m.getAmount());
                     }
                     questSec.set("item-craft-amounts", craftAmounts);
                 }
                 if (!questData.itemsSmelted.isEmpty()) {
-                    final LinkedList<Integer> smeltAmounts = new LinkedList<Integer>();
+                    final LinkedList<Integer> smeltAmounts = new LinkedList<>();
                     for (final ItemStack m : questData.itemsSmelted) {
                         smeltAmounts.add(m.getAmount());
                     }
                     questSec.set("item-smelt-amounts", smeltAmounts);
                 }
                 if (!questData.itemsEnchanted.isEmpty()) {
-                    final LinkedList<Integer> enchantAmounts = new LinkedList<Integer>();
+                    final LinkedList<Integer> enchantAmounts = new LinkedList<>();
                     for (final ItemStack m : questData.itemsEnchanted) {
                         enchantAmounts.add(m.getAmount());
                     }
                     questSec.set("item-enchant-amounts", enchantAmounts);
                 }
                 if (!questData.itemsBrewed.isEmpty()) {
-                    final LinkedList<Integer> brewAmounts = new LinkedList<Integer>();
+                    final LinkedList<Integer> brewAmounts = new LinkedList<>();
                     for (final ItemStack m : questData.itemsBrewed) {
                         brewAmounts.add(m.getAmount());
                     }
                     questSec.set("item-brew-amounts", brewAmounts);
                 }
                 if (!questData.itemsConsumed.isEmpty()) {
-                    final LinkedList<Integer> consumeAmounts = new LinkedList<Integer>();
+                    final LinkedList<Integer> consumeAmounts = new LinkedList<>();
                     for (final ItemStack m : questData.itemsConsumed) {
                         consumeAmounts.add(m.getAmount());
                     }
                     questSec.set("item-consume-amounts", consumeAmounts);
                 }
                 if (!questData.itemsDelivered.isEmpty()) {
-                    final LinkedList<Integer> deliveryAmounts = new LinkedList<Integer>();
+                    final LinkedList<Integer> deliveryAmounts = new LinkedList<>();
                     for (final ItemStack m : questData.itemsDelivered) {
                         deliveryAmounts.add(m.getAmount());
                     }
@@ -3535,7 +3491,7 @@ public class Quester implements Comparable<Quester> {
                     questSec.set("citizen-amounts-killed", questData.citizensNumKilled);
                 }
                 if (!questData.mobTypesKilled.isEmpty()) {
-                    final LinkedList<String> mobNames = new LinkedList<String>();
+                    final LinkedList<String> mobNames = new LinkedList<>();
                     for (final EntityType e : questData.mobTypesKilled) {
                         mobNames.add(MiscUtil.getPrettyMobName(e));
                     }
@@ -3581,16 +3537,15 @@ public class Quester implements Comparable<Quester> {
         if (completedQuests.isEmpty()) {
             data.set("completed-Quests", "none");
         } else {
-            //final List<String> questIds = completedQuests.stream().map(Quest::getId).collect(Collectors.toList());
-            final List<String> questIds = new LinkedList<String>();
+            final List<String> questIds = new LinkedList<>();
             for (final Quest quest : completedQuests) {
                 questIds.add(quest.getId());
             }
             data.set("completed-Quests", questIds);
         }
         if (!completedTimes.isEmpty()) {
-            final List<String> questIds = new LinkedList<String>();
-            final List<Long> questTimes = new LinkedList<Long>();
+            final List<String> questIds = new LinkedList<>();
+            final List<Long> questTimes = new LinkedList<>();
             for (final Entry<Quest, Long> entry : completedTimes.entrySet()) {
                 questIds.add(entry.getKey().getId());
                 questTimes.add(entry.getValue());
@@ -3599,14 +3554,14 @@ public class Quester implements Comparable<Quester> {
             data.set("completedQuestTimes", questTimes);
         }
         if (!amountsCompleted.isEmpty()) {
-            final List<String> questIds = new LinkedList<String>();
-            final List<Integer> questAmts = new LinkedList<Integer>();
+            final List<String> questIds = new LinkedList<>();
+            final List<Integer> questAmounts = new LinkedList<>();
             for (final Entry<Quest, Integer> entry : amountsCompleted.entrySet()) {
                 questIds.add(entry.getKey().getId());
-                questAmts.add(entry.getValue());
+                questAmounts.add(entry.getValue());
             }
             data.set("amountsCompletedQuests", questIds);
-            data.set("amountsCompleted", questAmts);
+            data.set("amountsCompleted", questAmounts);
         }
         // #getPlayer is faster
         OfflinePlayer representedPlayer = getPlayer();
@@ -3643,10 +3598,7 @@ public class Quester implements Comparable<Quester> {
      * @return false if empty
      */
     public boolean hasBaseData() {
-        if (!currentQuests.isEmpty() || !questData.isEmpty() || !completedQuests.isEmpty()) {
-            return true;
-        }
-        return false;
+        return !currentQuests.isEmpty() || !questData.isEmpty() || !completedQuests.isEmpty();
     }
 
     /**
@@ -3662,8 +3614,10 @@ public class Quester implements Comparable<Quester> {
                     (long) (getCurrentStage(quest).delay * 0.02));
             if (getCurrentStage(quest).delayMessage != null) {
                 final Player p = plugin.getServer().getPlayer(id);
-                p.sendMessage(ConfigUtil.parseStringWithPossibleLineBreaks((getCurrentStage(quest)
-                        .delayMessage), quest, p));
+                if (p != null) {
+                    p.sendMessage(ConfigUtil.parseStringWithPossibleLineBreaks((getCurrentStage(quest)
+                            .delayMessage), quest, p));
+                }
             }
         }
         getQuestData(quest).setDelayStartTime(System.currentTimeMillis());
@@ -3681,7 +3635,6 @@ public class Quester implements Comparable<Quester> {
             getQuestData(quest).setDelayTimeLeft(getCurrentStage(quest).delay - (System.currentTimeMillis() 
                     - getQuestData(quest).getDelayStartTime()));
         }
-        //getQuestData(quest).setDelayOver(false);
     }
     
     /**
@@ -3757,27 +3710,29 @@ public class Quester implements Comparable<Quester> {
                 }
                 final ItemStack display = quest.guiDisplay;
                 final ItemMeta meta = display.getItemMeta();
-                if (completedQuests.contains(quest)) {
-                    meta.setDisplayName(ChatColor.DARK_PURPLE + ConfigUtil.parseString(quest.getName()
-                            + " " + ChatColor.GREEN + Lang.get(player, "redoCompleted"), npc));
-                } else {
-                    meta.setDisplayName(ChatColor.DARK_PURPLE + ConfigUtil.parseString(quest.getName(), npc));
-                }
-                if (!meta.hasLore()) {
-                    LinkedList<String> lines = new LinkedList<String>();
-                    String desc = quest.description;
-                    if (plugin.getDependencies().getPlaceholderApi() != null) {
-                        desc = PlaceholderAPI.setPlaceholders(player, desc);
-                    }
-                    if (desc.equals(ChatColor.stripColor(desc))) {
-                        lines = MiscUtil.makeLines(desc, " ", 40, ChatColor.DARK_GREEN);
+                if (meta != null) {
+                    if (completedQuests.contains(quest)) {
+                        meta.setDisplayName(ChatColor.DARK_PURPLE + ConfigUtil.parseString(quest.getName()
+                                + " " + ChatColor.GREEN + Lang.get(player, "redoCompleted"), npc));
                     } else {
-                        lines = MiscUtil.makeLines(desc, " ", 40, null);
+                        meta.setDisplayName(ChatColor.DARK_PURPLE + ConfigUtil.parseString(quest.getName(), npc));
                     }
-                    meta.setLore(lines);
+                    if (!meta.hasLore()) {
+                        final LinkedList<String> lines;
+                        String desc = quest.description;
+                        if (plugin.getDependencies().getPlaceholderApi() != null) {
+                            desc = PlaceholderAPI.setPlaceholders(player, desc);
+                        }
+                        if (desc.equals(ChatColor.stripColor(desc))) {
+                            lines = MiscUtil.makeLines(desc, " ", 40, ChatColor.DARK_GREEN);
+                        } else {
+                            lines = MiscUtil.makeLines(desc, " ", 40, null);
+                        }
+                        meta.setLore(lines);
+                    }
+                    meta.addItemFlags(ItemFlag.values());
+                    display.setItemMeta(meta);
                 }
-                meta.addItemFlags(ItemFlag.values());
-                display.setItemMeta(meta);
                 inv.setItem(i, display);
                 i++;
             }
@@ -3795,9 +3750,7 @@ public class Quester implements Comparable<Quester> {
     public void hardQuit(final Quest quest) {
         try {
             currentQuests.remove(quest);
-            if (questData.containsKey(quest)) {
-                questData.remove(quest);
-            }
+            questData.remove(quest);
             if (!timers.isEmpty()) {
                 for (final Map.Entry<Integer, Quest> entry : timers.entrySet()) {
                     if (entry.getValue().getName().equals(quest.getName())) {
@@ -3876,9 +3829,7 @@ public class Quester implements Comparable<Quester> {
     public boolean canUseCompass() {
         if (getPlayer() != null) {
             if (!getPlayer().hasPermission("worldedit.navigation.jumpto")) {
-                if (getPlayer().hasPermission("quests.compass")) {
-                    return true;
-                }
+                return getPlayer().hasPermission("quests.compass");
             }
         }
         return false;
@@ -3903,9 +3854,7 @@ public class Quester implements Comparable<Quester> {
             defaultLocation = player.getWorld().getSpawnLocation();
         }
         compassTargetQuestId = null;
-        if (defaultLocation != null) {
-            player.setCompassTarget(defaultLocation);
-        }
+        player.setCompassTarget(defaultLocation);
     }
 
     /**
@@ -3932,37 +3881,34 @@ public class Quester implements Comparable<Quester> {
         if (!canUseCompass()) {
             return;
         }
-        Bukkit.getScheduler().runTaskAsynchronously(plugin, new Runnable() {
-            @Override
-            public void run() {
-                final LinkedList<String> list = currentQuests.keySet().stream()
-                        .sorted(Comparator.comparing(Quest::getName)).map(Quest::getId)
-                        .collect(Collectors.toCollection(LinkedList::new));
-                int index = 0;
-                if (compassTargetQuestId != null) {
-                    if (!list.contains(compassTargetQuestId) && notify) {
-                        return;
-                    }
-                    index = list.indexOf(compassTargetQuestId) + 1;
-                    if (index >= list.size()) {
-                        index = 0;
+        Bukkit.getScheduler().runTaskAsynchronously(plugin, () -> {
+            final LinkedList<String> list = currentQuests.keySet().stream()
+                    .sorted(Comparator.comparing(Quest::getName)).map(Quest::getId)
+                    .collect(Collectors.toCollection(LinkedList::new));
+            int index = 0;
+            if (compassTargetQuestId != null) {
+                if (!list.contains(compassTargetQuestId) && notify) {
+                    return;
+                }
+                index = list.indexOf(compassTargetQuestId) + 1;
+                if (index >= list.size()) {
+                    index = 0;
+                }
+            }
+            if (list.size() > 0) {
+                final Quest quest = plugin.getQuestById(list.get(index));
+                compassTargetQuestId = quest.getId();
+                final Stage stage = getCurrentStage(quest);
+                if (stage != null) {
+                    quest.updateCompass(Quester.this, stage);
+                    if (notify) {
+                        sendMessage(ChatColor.YELLOW + Lang.get(getPlayer(), "compassSet")
+                                .replace("<quest>", ChatColor.GOLD + quest.getName() + ChatColor.YELLOW));
                     }
                 }
-                if (list.size() > 0) {
-                    final Quest quest = plugin.getQuestById(list.get(index));
-                    compassTargetQuestId = quest.getId();
-                    final Stage stage = getCurrentStage(quest);
-                    if (stage != null) {
-                        quest.updateCompass(Quester.this, stage);
-                        if (notify) {
-                            sendMessage(ChatColor.YELLOW + Lang.get(getPlayer(), "compassSet")
-                                    .replace("<quest>", ChatColor.GOLD + quest.getName() + ChatColor.YELLOW));
-                        }
-                    }
-                } else {
-                    sendMessage(ChatColor.RED + Lang.get(getPlayer(), "journalNoQuests")
-                            .replace("<journal>", Lang.get(getPlayer(), "journalTitle")));
-                }
+            } else {
+                sendMessage(ChatColor.RED + Lang.get(getPlayer(), "journalNoQuests")
+                        .replace("<journal>", Lang.get(getPlayer(), "journalTitle")));
             }
         });
     }
@@ -4013,7 +3959,7 @@ public class Quester implements Comparable<Quester> {
      */
     public Set<String> dispatchMultiplayerEverything(final Quest quest, final ObjectiveType type,
             final BiFunction<Quester, Quest, Void> fun) {
-        final Set<String> appliedQuestIDs = new HashSet<String>();
+        final Set<String> appliedQuestIDs = new HashSet<>();
         if (quest != null) {
             try {
                 if (quest.getOptions().getShareProgressLevel() == 1) {
@@ -4059,7 +4005,7 @@ public class Quester implements Comparable<Quester> {
      */
     public Set<String> dispatchMultiplayerObjectives(final Quest quest, final Stage currentStage,
             final Function<Quester, Void> fun) {
-        final Set<String> appliedQuestIDs = new HashSet<String>();
+        final Set<String> appliedQuestIDs = new HashSet<>();
         if (quest.getOptions().getShareProgressLevel() == 2) {
             final List<Quester> mq = getMultiplayerQuesters(quest);
             if (mq == null) {
@@ -4089,38 +4035,39 @@ public class Quester implements Comparable<Quester> {
         if (quest == null) {
             return null;
         }
-        final List<Quester> mq = new LinkedList<Quester>();
+        final List<Quester> mq = new LinkedList<>();
         if (plugin.getDependencies().getPartyProvider() != null) {
             final PartyProvider partyProvider = plugin.getDependencies().getPartyProvider();
-            if (partyProvider != null && quest.getOptions().canUsePartiesPlugin()
-                    || quest.getOptions().canUseDungeonsXLPlugin()) {
-                if (getUUID() != null && partyProvider.getPartyId(getUUID()) != null) {
-                    String partyId = partyProvider.getPartyId(getUUID());
-                    final double distanceSquared = quest.getOptions().getShareDistance()
-                            * quest.getOptions().getShareDistance();
-                    final boolean offlinePlayers = quest.getOptions().canHandleOfflinePlayers();
-                    if (offlinePlayers) {
-                        for (final UUID id : partyProvider.getMembers(partyId)) {
-                            if (!id.equals(getUUID())) {
-                                mq.add(plugin.getQuester(id));
-                            }
-                        }
-                    } else {
-                        for (final UUID id : partyProvider.getOnlineMembers(partyId)) {
-                            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 {
+            if (partyProvider != null) {
+                if (quest.getOptions().canUsePartiesPlugin() || quest.getOptions().canUseDungeonsXLPlugin()) {
+                    if (getUUID() != null && partyProvider.getPartyId(getUUID()) != null) {
+                        final String partyId = partyProvider.getPartyId(getUUID());
+                        final double distanceSquared = quest.getOptions().getShareDistance()
+                                * quest.getOptions().getShareDistance();
+                        final boolean offlinePlayers = quest.getOptions().canHandleOfflinePlayers();
+                        if (offlinePlayers) {
+                            for (final UUID id : partyProvider.getMembers(partyId)) {
+                                if (!id.equals(getUUID())) {
                                     mq.add(plugin.getQuester(id));
                                 }
                             }
+                        } else {
+                            for (final UUID id : partyProvider.getOnlineMembers(partyId)) {
+                                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;
                     }
-                    return mq;
                 }
             }
         } else if (plugin.getDependencies().getPartiesApi() != null) {
@@ -4153,7 +4100,6 @@ public class Quester implements Comparable<Quester> {
                                 }
                             }
                         }
-
                         return mq;
                     }
                 }
@@ -4179,8 +4125,8 @@ public class Quester implements Comparable<Quester> {
             return false;
         }
         if (canAcceptOffer(quest, giveReason)) {
-            if (getPlayer() instanceof Conversable) {
-                if (getPlayer().isConversing() == false) {
+            if (getPlayer() != null) {
+                if (!getPlayer().isConversing()) {
                     setQuestIdToTake(quest.getId());
                     final String s = ChatColor.GOLD + Lang.get("questObjectivesTitle")
                             .replace("<quest>", quest.getName()) + "\n" + ChatColor.RESET + quest.getDescription();
@@ -4235,7 +4181,9 @@ public class Quester implements Comparable<Quester> {
             return false;
         } else if (plugin.getDependencies().getCitizens() != null
                 && !plugin.getSettings().canAllowCommandsForNpcQuests()
-                && quest.getNpcStart() != null && quest.getNpcStart().getEntity() != null 
+                && quest.getNpcStart() != null && quest.getNpcStart().getEntity() != null
+                && quest.getNpcStart().getEntity().getLocation().getWorld() != null
+                && getPlayer().getLocation().getWorld() != null
                 && quest.getNpcStart().getEntity().getLocation().getWorld().getName().equals(
                 getPlayer().getLocation().getWorld().getName())
                 && quest.getNpcStart().getEntity().getLocation().distance(getPlayer().getLocation()) > 6.0) {
diff --git a/main/src/main/java/me/blackvein/quests/Requirements.java b/main/src/main/java/me/blackvein/quests/Requirements.java
index 417767a4e..886bc689c 100644
--- a/main/src/main/java/me/blackvein/quests/Requirements.java
+++ b/main/src/main/java/me/blackvein/quests/Requirements.java
@@ -12,27 +12,27 @@
 
 package me.blackvein.quests;
 
+import org.bukkit.inventory.ItemStack;
+
 import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 
-import org.bukkit.inventory.ItemStack;
-
 public class Requirements {
     private int money = 0;
     private int questPoints = 0;
-    private List<ItemStack> items = new LinkedList<ItemStack>();
-    private List<Boolean> removeItems = new LinkedList<Boolean>();
-    private List<Quest> neededQuests = new LinkedList<Quest>();
-    private List<Quest> blockQuests = new LinkedList<Quest>();
-    private List<String> permissions = new LinkedList<String>();
-    private List<String> mcmmoSkills = new LinkedList<String>();
-    private List<Integer> mcmmoAmounts = new LinkedList<Integer>();
+    private List<ItemStack> items = new LinkedList<>();
+    private List<Boolean> removeItems = new LinkedList<>();
+    private List<Quest> neededQuests = new LinkedList<>();
+    private List<Quest> blockQuests = new LinkedList<>();
+    private List<String> permissions = new LinkedList<>();
+    private List<String> mcmmoSkills = new LinkedList<>();
+    private List<Integer> mcmmoAmounts = new LinkedList<>();
     private String heroesPrimaryClass = null;
     private String heroesSecondaryClass = null;
-    private Map<String, Map<String, Object>> customRequirements = new HashMap<String, Map<String, Object>>();
-    private List<String> detailsOverride = new LinkedList<String>();
+    private Map<String, Map<String, Object>> customRequirements = new HashMap<>();
+    private List<String> detailsOverride = new LinkedList<>();
     
     public int getMoney() {
         return money;
diff --git a/main/src/main/java/me/blackvein/quests/Rewards.java b/main/src/main/java/me/blackvein/quests/Rewards.java
index e4d49998a..f6f90a346 100644
--- a/main/src/main/java/me/blackvein/quests/Rewards.java
+++ b/main/src/main/java/me/blackvein/quests/Rewards.java
@@ -12,30 +12,30 @@
 
 package me.blackvein.quests;
 
+import org.bukkit.inventory.ItemStack;
+
 import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 
-import org.bukkit.inventory.ItemStack;
-
 public class Rewards {
     private int money = 0;
     private int questPoints = 0;
     private int exp = 0;
-    private List<String> commands = new LinkedList<String>();
-    private List<String> commandsOverrideDisplay = new LinkedList<String>();
-    private List<String> permissions = new LinkedList<String>();
-    private List<String> permissionWorlds = new LinkedList<String>();
-    private List<ItemStack> items = new LinkedList<ItemStack>();
-    private List<String> mcmmoSkills = new LinkedList<String>();
-    private List<Integer> mcmmoAmounts = new LinkedList<Integer>();
-    private List<String> heroesClasses = new LinkedList<String>();
-    private List<Double> heroesAmounts = new LinkedList<Double>();
+    private List<String> commands = new LinkedList<>();
+    private List<String> commandsOverrideDisplay = new LinkedList<>();
+    private List<String> permissions = new LinkedList<>();
+    private List<String> permissionWorlds = new LinkedList<>();
+    private List<ItemStack> items = new LinkedList<>();
+    private List<String> mcmmoSkills = new LinkedList<>();
+    private List<Integer> mcmmoAmounts = new LinkedList<>();
+    private List<String> heroesClasses = new LinkedList<>();
+    private List<Double> heroesAmounts = new LinkedList<>();
     private int partiesExperience = 0;
-    private List<String> phatLoots = new LinkedList<String>();
-    private Map<String, Map<String, Object>> customRewards = new HashMap<String, Map<String, Object>>();
-    private List<String> detailsOverride = new LinkedList<String>();
+    private List<String> phatLoots = new LinkedList<>();
+    private Map<String, Map<String, Object>> customRewards = new HashMap<>();
+    private List<String> detailsOverride = new LinkedList<>();
     
     public int getMoney() {
         return money;
diff --git a/main/src/main/java/me/blackvein/quests/Settings.java b/main/src/main/java/me/blackvein/quests/Settings.java
index d2a3d4ca6..e95b27e76 100644
--- a/main/src/main/java/me/blackvein/quests/Settings.java
+++ b/main/src/main/java/me/blackvein/quests/Settings.java
@@ -17,6 +17,7 @@ import org.bukkit.configuration.file.FileConfiguration;
 
 import java.io.File;
 import java.io.IOException;
+import java.util.Objects;
 
 public class Settings {
     
@@ -186,7 +187,7 @@ public class Settings {
         genFilesOnJoin = config.getBoolean("generate-files-on-join", true);
         ignoreLockedQuests = config.getBoolean("ignore-locked-quests", false);
         killDelay = config.getInt("kill-delay", 600);
-        if (config.getString("language").equalsIgnoreCase("en")) {
+        if (Objects.requireNonNull(config.getString("language")).equalsIgnoreCase("en")) {
             //Legacy
             Lang.setISO("en-US");
         } else {
diff --git a/main/src/main/java/me/blackvein/quests/Stage.java b/main/src/main/java/me/blackvein/quests/Stage.java
index 0f2e463ec..3300e222f 100644
--- a/main/src/main/java/me/blackvein/quests/Stage.java
+++ b/main/src/main/java/me/blackvein/quests/Stage.java
@@ -28,17 +28,17 @@ import java.util.Map.Entry;
 
 public class Stage {
 
-    protected LinkedList<ItemStack> blocksToBreak = new LinkedList<ItemStack>();
-    protected LinkedList<ItemStack> blocksToDamage = new LinkedList<ItemStack>();
-    protected LinkedList<ItemStack> blocksToPlace = new LinkedList<ItemStack>();
-    protected LinkedList<ItemStack> blocksToUse = new LinkedList<ItemStack>();
-    protected LinkedList<ItemStack> blocksToCut = new LinkedList<ItemStack>();
-    protected LinkedList<ItemStack> itemsToCraft = new LinkedList<ItemStack>();
-    protected LinkedList<ItemStack> itemsToSmelt = new LinkedList<ItemStack>();
-    protected LinkedList<ItemStack> itemsToEnchant = new LinkedList<ItemStack>();
-    protected LinkedList<ItemStack> itemsToBrew = new LinkedList<ItemStack>();
-    protected LinkedList<ItemStack> itemsToConsume = new LinkedList<ItemStack>();
-    protected LinkedList<ItemStack> itemsToDeliver = new LinkedList<ItemStack>();
+    protected LinkedList<ItemStack> blocksToBreak = new LinkedList<>();
+    protected LinkedList<ItemStack> blocksToDamage = new LinkedList<>();
+    protected LinkedList<ItemStack> blocksToPlace = new LinkedList<>();
+    protected LinkedList<ItemStack> blocksToUse = new LinkedList<>();
+    protected LinkedList<ItemStack> blocksToCut = new LinkedList<>();
+    protected LinkedList<ItemStack> itemsToCraft = new LinkedList<>();
+    protected LinkedList<ItemStack> itemsToSmelt = new LinkedList<>();
+    protected LinkedList<ItemStack> itemsToEnchant = new LinkedList<>();
+    protected LinkedList<ItemStack> itemsToBrew = new LinkedList<>();
+    protected LinkedList<ItemStack> itemsToConsume = new LinkedList<>();
+    protected LinkedList<ItemStack> itemsToDeliver = new LinkedList<>();
     protected LinkedList<Integer> itemDeliveryTargets = new LinkedList<Integer>() {
 
         private static final long serialVersionUID = -2774443496142382127L;
@@ -59,7 +59,7 @@ public class Stage {
             return true;
         }
     };
-    protected  LinkedList<String> deliverMessages = new LinkedList<String>();
+    protected  LinkedList<String> deliverMessages = new LinkedList<>();
     protected LinkedList<Integer> citizensToInteract = new LinkedList<Integer>() {
 
         private static final long serialVersionUID = -4086855121042524435L;
@@ -100,43 +100,43 @@ public class Stage {
             return true;
         }
     };
-    protected LinkedList<Integer> citizenNumToKill = new LinkedList<Integer>();
-    protected LinkedList<EntityType> mobsToKill = new LinkedList<EntityType>();
-    protected LinkedList<Integer> mobNumToKill = new LinkedList<Integer>();
-    protected LinkedList<Location> locationsToKillWithin = new LinkedList<Location>();
-    protected LinkedList<Integer> radiiToKillWithin = new LinkedList<Integer>();
-    protected LinkedList<String> killNames = new LinkedList<String>();
-    protected LinkedList<EntityType> mobsToTame = new LinkedList<EntityType>();
-    protected LinkedList<Integer> mobNumToTame = new LinkedList<Integer>();
+    protected LinkedList<Integer> citizenNumToKill = new LinkedList<>();
+    protected LinkedList<EntityType> mobsToKill = new LinkedList<>();
+    protected LinkedList<Integer> mobNumToKill = new LinkedList<>();
+    protected LinkedList<Location> locationsToKillWithin = new LinkedList<>();
+    protected LinkedList<Integer> radiiToKillWithin = new LinkedList<>();
+    protected LinkedList<String> killNames = new LinkedList<>();
+    protected LinkedList<EntityType> mobsToTame = new LinkedList<>();
+    protected LinkedList<Integer> mobNumToTame = new LinkedList<>();
     protected Integer fishToCatch;
     protected Integer cowsToMilk;
-    protected LinkedList<DyeColor> sheepToShear = new LinkedList<DyeColor>();
-    protected LinkedList<Integer> sheepNumToShear = new LinkedList<Integer>();
+    protected LinkedList<DyeColor> sheepToShear = new LinkedList<>();
+    protected LinkedList<Integer> sheepNumToShear = new LinkedList<>();
     protected Integer playersToKill;
-    protected LinkedList<Location> locationsToReach = new LinkedList<Location>();
-    protected LinkedList<Integer> radiiToReachWithin = new LinkedList<Integer>();
-    protected LinkedList<World> worldsToReachWithin = new LinkedList<World>();
-    protected LinkedList<String> locationNames = new LinkedList<String>();
-    protected LinkedList<String> passwordDisplays = new LinkedList<String>();
-    protected LinkedList<String> passwordPhrases = new LinkedList<String>();
+    protected LinkedList<Location> locationsToReach = new LinkedList<>();
+    protected LinkedList<Integer> radiiToReachWithin = new LinkedList<>();
+    protected LinkedList<World> worldsToReachWithin = new LinkedList<>();
+    protected LinkedList<String> locationNames = new LinkedList<>();
+    protected LinkedList<String> passwordDisplays = new LinkedList<>();
+    protected LinkedList<String> passwordPhrases = new LinkedList<>();
     protected String script;
     protected Action startAction = null;
     protected Action finishAction = null;
     protected Action failAction = null;
     protected Action deathAction = null;
-    protected Map<String, Action> chatActions = new HashMap<String, Action>();
-    protected Map<String, Action> commandActions = new HashMap<String, Action>();
+    protected Map<String, Action> chatActions = new HashMap<>();
+    protected Map<String, Action> commandActions = new HashMap<>();
     protected Action disconnectAction = null;
     protected Condition condition = null;
     protected long delay = -1;
     protected String delayMessage = null;
     protected String completeMessage = null;
     protected String startMessage = null;
-    protected LinkedList<String> objectiveOverrides = new LinkedList<String>();
-    protected LinkedList<CustomObjective> customObjectives = new LinkedList<CustomObjective>();
-    protected LinkedList<Integer> customObjectiveCounts = new LinkedList<Integer>();
-    protected LinkedList<String> customObjectiveDisplays = new LinkedList<String>();
-    protected LinkedList<Entry<String, Object>> customObjectiveData = new LinkedList<Entry<String, Object>>();
+    protected LinkedList<String> objectiveOverrides = new LinkedList<>();
+    protected LinkedList<CustomObjective> customObjectives = new LinkedList<>();
+    protected LinkedList<Integer> customObjectiveCounts = new LinkedList<>();
+    protected LinkedList<String> customObjectiveDisplays = new LinkedList<>();
+    protected LinkedList<Entry<String, Object>> customObjectiveData = new LinkedList<>();
     
     public LinkedList<ItemStack> getBlocksToBreak() {
         return blocksToBreak;
@@ -566,8 +566,7 @@ public class Stage {
         if (!mobsToTame.isEmpty()) { return true; }
         if (!sheepToShear.isEmpty()) { return true; }
         if (!passwordDisplays.isEmpty()) { return true; }
-        if (!customObjectives.isEmpty()) { return true; }
-        return false;
+        return !customObjectives.isEmpty();
     }
     
     /**
diff --git a/v1_8_R1/src/main/java/me/blackvein/quests/particle/ParticleProvider_v1_8_R1.java b/v1_8_R1/src/main/java/me/blackvein/quests/particle/ParticleProvider_v1_8_R1.java
index 88a068329..7493a2258 100644
--- a/v1_8_R1/src/main/java/me/blackvein/quests/particle/ParticleProvider_v1_8_R1.java
+++ b/v1_8_R1/src/main/java/me/blackvein/quests/particle/ParticleProvider_v1_8_R1.java
@@ -23,7 +23,7 @@ import java.util.Map;
 
 public class ParticleProvider_v1_8_R1 extends ParticleProvider {
 
-    private static Map<PreBuiltParticle, Object> PARTICLES = new HashMap<>();
+    private static final Map<PreBuiltParticle, Object> PARTICLES = new HashMap<>();
 
     static {
         PARTICLES.put(PreBuiltParticle.ENCHANT, EnumParticle.ENCHANTMENT_TABLE);
diff --git a/v1_8_R2/src/main/java/me/blackvein/quests/particle/ParticleProvider_v1_8_R2.java b/v1_8_R2/src/main/java/me/blackvein/quests/particle/ParticleProvider_v1_8_R2.java
index 469fdee0b..df02f6b14 100644
--- a/v1_8_R2/src/main/java/me/blackvein/quests/particle/ParticleProvider_v1_8_R2.java
+++ b/v1_8_R2/src/main/java/me/blackvein/quests/particle/ParticleProvider_v1_8_R2.java
@@ -12,19 +12,18 @@
 
 package me.blackvein.quests.particle;
 
-import java.util.HashMap;
-import java.util.Map;
-
+import net.minecraft.server.v1_8_R2.EnumParticle;
+import net.minecraft.server.v1_8_R2.PacketPlayOutWorldParticles;
 import org.bukkit.Location;
 import org.bukkit.craftbukkit.v1_8_R2.entity.CraftPlayer;
 import org.bukkit.entity.Player;
 
-import net.minecraft.server.v1_8_R2.EnumParticle;
-import net.minecraft.server.v1_8_R2.PacketPlayOutWorldParticles;
+import java.util.HashMap;
+import java.util.Map;
 
 public class ParticleProvider_v1_8_R2 extends ParticleProvider {
 
-    private static Map<PreBuiltParticle, Object> PARTICLES = new HashMap<>();
+    private static final Map<PreBuiltParticle, Object> PARTICLES = new HashMap<>();
 
     static {
         PARTICLES.put(PreBuiltParticle.ENCHANT, EnumParticle.ENCHANTMENT_TABLE);
diff --git a/v1_8_R3/src/main/java/me/blackvein/quests/particle/ParticleProvider_v1_8_R3.java b/v1_8_R3/src/main/java/me/blackvein/quests/particle/ParticleProvider_v1_8_R3.java
index 5f9b33da9..b3d21582a 100644
--- a/v1_8_R3/src/main/java/me/blackvein/quests/particle/ParticleProvider_v1_8_R3.java
+++ b/v1_8_R3/src/main/java/me/blackvein/quests/particle/ParticleProvider_v1_8_R3.java
@@ -12,19 +12,18 @@
 
 package me.blackvein.quests.particle;
 
-import java.util.HashMap;
-import java.util.Map;
-
+import net.minecraft.server.v1_8_R3.EnumParticle;
+import net.minecraft.server.v1_8_R3.PacketPlayOutWorldParticles;
 import org.bukkit.Location;
 import org.bukkit.craftbukkit.v1_8_R3.entity.CraftPlayer;
 import org.bukkit.entity.Player;
 
-import net.minecraft.server.v1_8_R3.EnumParticle;
-import net.minecraft.server.v1_8_R3.PacketPlayOutWorldParticles;
+import java.util.HashMap;
+import java.util.Map;
 
 public class ParticleProvider_v1_8_R3 extends ParticleProvider {
 
-    private static Map<PreBuiltParticle, Object> PARTICLES = new HashMap<>();
+    private static final Map<PreBuiltParticle, Object> PARTICLES = new HashMap<>();
 
     static {
         PARTICLES.put(PreBuiltParticle.ENCHANT, EnumParticle.ENCHANTMENT_TABLE);