diff --git a/src/main/java/com/massivecraft/factions/ExtractorFactionAccountId.java b/src/main/java/com/massivecraft/factions/ExtractorFactionAccountId.java
index 54017c6d..bc7d14a3 100644
--- a/src/main/java/com/massivecraft/factions/ExtractorFactionAccountId.java
+++ b/src/main/java/com/massivecraft/factions/ExtractorFactionAccountId.java
@@ -8,7 +8,7 @@ public class ExtractorFactionAccountId implements Extractor {
     // INSTANCE & CONSTRUCT
     // -------------------------------------------- //
 
-    private static ExtractorFactionAccountId i = new ExtractorFactionAccountId();
+    private static final ExtractorFactionAccountId i = new ExtractorFactionAccountId();
 
     public static ExtractorFactionAccountId get() {
         return i;
diff --git a/src/main/java/com/massivecraft/factions/Factions.java b/src/main/java/com/massivecraft/factions/Factions.java
index a1e2c76c..a0ad7b2f 100644
--- a/src/main/java/com/massivecraft/factions/Factions.java
+++ b/src/main/java/com/massivecraft/factions/Factions.java
@@ -96,7 +96,7 @@ public class Factions extends MassivePlugin {
     public final static String ID_SAFEZONE = "safezone";
     public final static String ID_WARZONE = "warzone";
 
-    public final static String NAME_NONE_DEFAULT = ChatColor.DARK_GREEN.toString() + "Wilderness";
+    public final static String NAME_NONE_DEFAULT = ChatColor.DARK_GREEN + "Wilderness";
     public final static String NAME_SAFEZONE_DEFAULT = "SafeZone";
     public final static String NAME_WARZONE_DEFAULT = "WarZone";
 
diff --git a/src/main/java/com/massivecraft/factions/FactionsIndex.java b/src/main/java/com/massivecraft/factions/FactionsIndex.java
index d0d9d3c7..bfffb589 100644
--- a/src/main/java/com/massivecraft/factions/FactionsIndex.java
+++ b/src/main/java/com/massivecraft/factions/FactionsIndex.java
@@ -24,7 +24,7 @@ public class FactionsIndex {
     // INSTANCE
     // -------------------------------------------- //
 
-    private static FactionsIndex i = new FactionsIndex();
+    private static final FactionsIndex i = new FactionsIndex();
 
     public static FactionsIndex get() {
         return i;
diff --git a/src/main/java/com/massivecraft/factions/adapter/BoardAdapter.java b/src/main/java/com/massivecraft/factions/adapter/BoardAdapter.java
index 8dec6e45..d67b71c0 100644
--- a/src/main/java/com/massivecraft/factions/adapter/BoardAdapter.java
+++ b/src/main/java/com/massivecraft/factions/adapter/BoardAdapter.java
@@ -15,7 +15,7 @@ public class BoardAdapter implements JsonDeserializer<Board>, JsonSerializer<Boa
     // INSTANCE & CONSTRUCT
     // -------------------------------------------- //
 
-    private static BoardAdapter i = new BoardAdapter();
+    private static final BoardAdapter i = new BoardAdapter();
 
     public static BoardAdapter get() {
         return i;
diff --git a/src/main/java/com/massivecraft/factions/adapter/BoardMapAdapter.java b/src/main/java/com/massivecraft/factions/adapter/BoardMapAdapter.java
index 728b156c..c8fef90c 100644
--- a/src/main/java/com/massivecraft/factions/adapter/BoardMapAdapter.java
+++ b/src/main/java/com/massivecraft/factions/adapter/BoardMapAdapter.java
@@ -20,7 +20,7 @@ public class BoardMapAdapter implements JsonDeserializer<Map<PS, TerritoryAccess
     // INSTANCE & CONSTRUCT
     // -------------------------------------------- //
 
-    private static BoardMapAdapter i = new BoardMapAdapter();
+    private static final BoardMapAdapter i = new BoardMapAdapter();
 
     public static BoardMapAdapter get() {
         return i;
diff --git a/src/main/java/com/massivecraft/factions/adapter/TerritoryAccessAdapter.java b/src/main/java/com/massivecraft/factions/adapter/TerritoryAccessAdapter.java
index ba2428cf..f2a80d9f 100644
--- a/src/main/java/com/massivecraft/factions/adapter/TerritoryAccessAdapter.java
+++ b/src/main/java/com/massivecraft/factions/adapter/TerritoryAccessAdapter.java
@@ -34,7 +34,7 @@ public class TerritoryAccessAdapter implements JsonDeserializer<TerritoryAccess>
     // INSTANCE & CONSTRUCT
     // -------------------------------------------- //
 
-    private static TerritoryAccessAdapter i = new TerritoryAccessAdapter();
+    private static final TerritoryAccessAdapter i = new TerritoryAccessAdapter();
 
     public static TerritoryAccessAdapter get() {
         return i;
diff --git a/src/main/java/com/massivecraft/factions/chat/modifier/ChatModifierLc.java b/src/main/java/com/massivecraft/factions/chat/modifier/ChatModifierLc.java
index 869b584e..aec43385 100644
--- a/src/main/java/com/massivecraft/factions/chat/modifier/ChatModifierLc.java
+++ b/src/main/java/com/massivecraft/factions/chat/modifier/ChatModifierLc.java
@@ -12,7 +12,7 @@ public class ChatModifierLc extends ChatModifier {
         super("lc");
     }
 
-    private static ChatModifierLc i = new ChatModifierLc();
+    private static final ChatModifierLc i = new ChatModifierLc();
 
     public static ChatModifierLc get() {
         return i;
diff --git a/src/main/java/com/massivecraft/factions/chat/modifier/ChatModifierLp.java b/src/main/java/com/massivecraft/factions/chat/modifier/ChatModifierLp.java
index c5f20ef5..8581bfe8 100644
--- a/src/main/java/com/massivecraft/factions/chat/modifier/ChatModifierLp.java
+++ b/src/main/java/com/massivecraft/factions/chat/modifier/ChatModifierLp.java
@@ -13,7 +13,7 @@ public class ChatModifierLp extends ChatModifier {
         super("lp");
     }
 
-    private static ChatModifierLp i = new ChatModifierLp();
+    private static final ChatModifierLp i = new ChatModifierLp();
 
     public static ChatModifierLp get() {
         return i;
diff --git a/src/main/java/com/massivecraft/factions/chat/modifier/ChatModifierParse.java b/src/main/java/com/massivecraft/factions/chat/modifier/ChatModifierParse.java
index abd2c382..bfd3bafe 100644
--- a/src/main/java/com/massivecraft/factions/chat/modifier/ChatModifierParse.java
+++ b/src/main/java/com/massivecraft/factions/chat/modifier/ChatModifierParse.java
@@ -13,7 +13,7 @@ public class ChatModifierParse extends ChatModifier {
         super("parse");
     }
 
-    private static ChatModifierParse i = new ChatModifierParse();
+    private static final ChatModifierParse i = new ChatModifierParse();
 
     public static ChatModifierParse get() {
         return i;
diff --git a/src/main/java/com/massivecraft/factions/chat/modifier/ChatModifierRp.java b/src/main/java/com/massivecraft/factions/chat/modifier/ChatModifierRp.java
index 43c6475f..8fcc6247 100644
--- a/src/main/java/com/massivecraft/factions/chat/modifier/ChatModifierRp.java
+++ b/src/main/java/com/massivecraft/factions/chat/modifier/ChatModifierRp.java
@@ -12,7 +12,7 @@ public class ChatModifierRp extends ChatModifier {
         super("rp");
     }
 
-    private static ChatModifierRp i = new ChatModifierRp();
+    private static final ChatModifierRp i = new ChatModifierRp();
 
     public static ChatModifierRp get() {
         return i;
diff --git a/src/main/java/com/massivecraft/factions/chat/modifier/ChatModifierUc.java b/src/main/java/com/massivecraft/factions/chat/modifier/ChatModifierUc.java
index 4a23a1ba..03e710ab 100644
--- a/src/main/java/com/massivecraft/factions/chat/modifier/ChatModifierUc.java
+++ b/src/main/java/com/massivecraft/factions/chat/modifier/ChatModifierUc.java
@@ -12,7 +12,7 @@ public class ChatModifierUc extends ChatModifier {
         super("uc");
     }
 
-    private static ChatModifierUc i = new ChatModifierUc();
+    private static final ChatModifierUc i = new ChatModifierUc();
 
     public static ChatModifierUc get() {
         return i;
diff --git a/src/main/java/com/massivecraft/factions/chat/modifier/ChatModifierUcf.java b/src/main/java/com/massivecraft/factions/chat/modifier/ChatModifierUcf.java
index 459f045c..d60336ab 100644
--- a/src/main/java/com/massivecraft/factions/chat/modifier/ChatModifierUcf.java
+++ b/src/main/java/com/massivecraft/factions/chat/modifier/ChatModifierUcf.java
@@ -13,7 +13,7 @@ public class ChatModifierUcf extends ChatModifier {
         super("ucf");
     }
 
-    private static ChatModifierUcf i = new ChatModifierUcf();
+    private static final ChatModifierUcf i = new ChatModifierUcf();
 
     public static ChatModifierUcf get() {
         return i;
diff --git a/src/main/java/com/massivecraft/factions/chat/tag/ChatTagName.java b/src/main/java/com/massivecraft/factions/chat/tag/ChatTagName.java
index b3320157..1a83d8dd 100644
--- a/src/main/java/com/massivecraft/factions/chat/tag/ChatTagName.java
+++ b/src/main/java/com/massivecraft/factions/chat/tag/ChatTagName.java
@@ -14,7 +14,7 @@ public class ChatTagName extends ChatTag {
         super("factions_name");
     }
 
-    private static ChatTagName i = new ChatTagName();
+    private static final ChatTagName i = new ChatTagName();
 
     public static ChatTagName get() {
         return i;
diff --git a/src/main/java/com/massivecraft/factions/chat/tag/ChatTagNameforce.java b/src/main/java/com/massivecraft/factions/chat/tag/ChatTagNameforce.java
index f1aee0a6..2ab48b5d 100644
--- a/src/main/java/com/massivecraft/factions/chat/tag/ChatTagNameforce.java
+++ b/src/main/java/com/massivecraft/factions/chat/tag/ChatTagNameforce.java
@@ -14,7 +14,7 @@ public class ChatTagNameforce extends ChatTag {
         super("factions_nameforce");
     }
 
-    private static ChatTagNameforce i = new ChatTagNameforce();
+    private static final ChatTagNameforce i = new ChatTagNameforce();
 
     public static ChatTagNameforce get() {
         return i;
diff --git a/src/main/java/com/massivecraft/factions/chat/tag/ChatTagRelcolor.java b/src/main/java/com/massivecraft/factions/chat/tag/ChatTagRelcolor.java
index 373b3240..92233214 100644
--- a/src/main/java/com/massivecraft/factions/chat/tag/ChatTagRelcolor.java
+++ b/src/main/java/com/massivecraft/factions/chat/tag/ChatTagRelcolor.java
@@ -13,7 +13,7 @@ public class ChatTagRelcolor extends ChatTag {
         super("factions_relcolor");
     }
 
-    private static ChatTagRelcolor i = new ChatTagRelcolor();
+    private static final ChatTagRelcolor i = new ChatTagRelcolor();
 
     public static ChatTagRelcolor get() {
         return i;
diff --git a/src/main/java/com/massivecraft/factions/chat/tag/ChatTagRole.java b/src/main/java/com/massivecraft/factions/chat/tag/ChatTagRole.java
index 79c98fc1..be5de5df 100644
--- a/src/main/java/com/massivecraft/factions/chat/tag/ChatTagRole.java
+++ b/src/main/java/com/massivecraft/factions/chat/tag/ChatTagRole.java
@@ -14,7 +14,7 @@ public class ChatTagRole extends ChatTag {
         super("factions_role");
     }
 
-    private static ChatTagRole i = new ChatTagRole();
+    private static final ChatTagRole i = new ChatTagRole();
 
     public static ChatTagRole get() {
         return i;
diff --git a/src/main/java/com/massivecraft/factions/chat/tag/ChatTagRoleprefix.java b/src/main/java/com/massivecraft/factions/chat/tag/ChatTagRoleprefix.java
index 380e79db..7af93b2d 100644
--- a/src/main/java/com/massivecraft/factions/chat/tag/ChatTagRoleprefix.java
+++ b/src/main/java/com/massivecraft/factions/chat/tag/ChatTagRoleprefix.java
@@ -14,7 +14,7 @@ public class ChatTagRoleprefix extends ChatTag {
         super("factions_roleprefix");
     }
 
-    private static ChatTagRoleprefix i = new ChatTagRoleprefix();
+    private static final ChatTagRoleprefix i = new ChatTagRoleprefix();
 
     public static ChatTagRoleprefix get() {
         return i;
diff --git a/src/main/java/com/massivecraft/factions/chat/tag/ChatTagRoleprefixforce.java b/src/main/java/com/massivecraft/factions/chat/tag/ChatTagRoleprefixforce.java
index ed63210c..5da7eaae 100644
--- a/src/main/java/com/massivecraft/factions/chat/tag/ChatTagRoleprefixforce.java
+++ b/src/main/java/com/massivecraft/factions/chat/tag/ChatTagRoleprefixforce.java
@@ -13,7 +13,7 @@ public class ChatTagRoleprefixforce extends ChatTag {
         super("factions_roleprefixforce");
     }
 
-    private static ChatTagRoleprefixforce i = new ChatTagRoleprefixforce();
+    private static final ChatTagRoleprefixforce i = new ChatTagRoleprefixforce();
 
     public static ChatTagRoleprefixforce get() {
         return i;
diff --git a/src/main/java/com/massivecraft/factions/chat/tag/ChatTagTitle.java b/src/main/java/com/massivecraft/factions/chat/tag/ChatTagTitle.java
index 037ec2d2..434e5686 100644
--- a/src/main/java/com/massivecraft/factions/chat/tag/ChatTagTitle.java
+++ b/src/main/java/com/massivecraft/factions/chat/tag/ChatTagTitle.java
@@ -13,7 +13,7 @@ public class ChatTagTitle extends ChatTag {
         super("factions_title");
     }
 
-    private static ChatTagTitle i = new ChatTagTitle();
+    private static final ChatTagTitle i = new ChatTagTitle();
 
     public static ChatTagTitle get() {
         return i;
diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactions.java b/src/main/java/com/massivecraft/factions/cmd/CmdFactions.java
index c222da1f..20287ac8 100644
--- a/src/main/java/com/massivecraft/factions/cmd/CmdFactions.java
+++ b/src/main/java/com/massivecraft/factions/cmd/CmdFactions.java
@@ -12,7 +12,7 @@ public class CmdFactions extends FactionsCommand {
     // INSTANCE
     // -------------------------------------------- //
 
-    private static CmdFactions i = new CmdFactions();
+    private static final CmdFactions i = new CmdFactions();
 
     public static CmdFactions get() {
         return i;
diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsFly.java b/src/main/java/com/massivecraft/factions/cmd/CmdFactionsFly.java
index 84791fbd..153c6751 100644
--- a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsFly.java
+++ b/src/main/java/com/massivecraft/factions/cmd/CmdFactionsFly.java
@@ -14,7 +14,7 @@ public class CmdFactionsFly extends MassiveCommandToggle {
     // INSTANCE
     // -------------------------------------------- //
 
-    private static CmdFactionsFly i = new CmdFactionsFly();
+    private static final CmdFactionsFly i = new CmdFactionsFly();
 
     public static CmdFactionsFly get() {
         return i;
diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsInviteRemove.java b/src/main/java/com/massivecraft/factions/cmd/CmdFactionsInviteRemove.java
index ad460f50..c397d1b4 100644
--- a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsInviteRemove.java
+++ b/src/main/java/com/massivecraft/factions/cmd/CmdFactionsInviteRemove.java
@@ -63,7 +63,7 @@ public class CmdFactionsInviteRemove extends FactionsCommand {
 
                 Mson kick = Mson.mson(
                         mson("You might want to kick him. ").color(ChatColor.YELLOW),
-                        mson(ChatColor.RED.toString() + tooltip).tooltip(ChatColor.YELLOW.toString() + tooltip).suggest(command)
+                        mson(ChatColor.RED + tooltip).tooltip(ChatColor.YELLOW + tooltip).suggest(command)
                 );
 
                 // Inform
@@ -106,7 +106,7 @@ public class CmdFactionsInviteRemove extends FactionsCommand {
 
                 Mson invite = Mson.mson(
                         mson("You might want to invite him. ").color(ChatColor.YELLOW),
-                        mson(ChatColor.GREEN.toString() + tooltip).tooltip(ChatColor.YELLOW.toString() + tooltip).suggest(command)
+                        mson(ChatColor.GREEN + tooltip).tooltip(ChatColor.YELLOW + tooltip).suggest(command)
                 );
 
                 // Inform
diff --git a/src/main/java/com/massivecraft/factions/cmd/req/ReqBankCommandsEnabled.java b/src/main/java/com/massivecraft/factions/cmd/req/ReqBankCommandsEnabled.java
index e5bf8d1d..1c15622e 100644
--- a/src/main/java/com/massivecraft/factions/cmd/req/ReqBankCommandsEnabled.java
+++ b/src/main/java/com/massivecraft/factions/cmd/req/ReqBankCommandsEnabled.java
@@ -18,7 +18,7 @@ public class ReqBankCommandsEnabled extends RequirementAbstract {
     // INSTANCE & CONSTRUCT
     // -------------------------------------------- //
 
-    private static ReqBankCommandsEnabled i = new ReqBankCommandsEnabled();
+    private static final ReqBankCommandsEnabled i = new ReqBankCommandsEnabled();
 
     public static ReqBankCommandsEnabled get() {
         return i;
diff --git a/src/main/java/com/massivecraft/factions/cmd/req/ReqFactionWarpsEnabled.java b/src/main/java/com/massivecraft/factions/cmd/req/ReqFactionWarpsEnabled.java
index b321a5ab..d688a485 100644
--- a/src/main/java/com/massivecraft/factions/cmd/req/ReqFactionWarpsEnabled.java
+++ b/src/main/java/com/massivecraft/factions/cmd/req/ReqFactionWarpsEnabled.java
@@ -17,7 +17,7 @@ public class ReqFactionWarpsEnabled extends RequirementAbstract {
     // INSTANCE & CONSTRUCT
     // -------------------------------------------- //
 
-    private static ReqFactionWarpsEnabled i = new ReqFactionWarpsEnabled();
+    private static final ReqFactionWarpsEnabled i = new ReqFactionWarpsEnabled();
 
     public static ReqFactionWarpsEnabled get() {
         return i;
diff --git a/src/main/java/com/massivecraft/factions/cmd/req/ReqHasFaction.java b/src/main/java/com/massivecraft/factions/cmd/req/ReqHasFaction.java
index c927a864..b6b30f66 100644
--- a/src/main/java/com/massivecraft/factions/cmd/req/ReqHasFaction.java
+++ b/src/main/java/com/massivecraft/factions/cmd/req/ReqHasFaction.java
@@ -18,7 +18,7 @@ public class ReqHasFaction extends RequirementAbstract {
     // INSTANCE & CONSTRUCT
     // -------------------------------------------- //
 
-    private static ReqHasFaction i = new ReqHasFaction();
+    private static final ReqHasFaction i = new ReqHasFaction();
 
     public static ReqHasFaction get() {
         return i;
diff --git a/src/main/java/com/massivecraft/factions/cmd/req/ReqHasntFaction.java b/src/main/java/com/massivecraft/factions/cmd/req/ReqHasntFaction.java
index 47a08759..bf0321d2 100644
--- a/src/main/java/com/massivecraft/factions/cmd/req/ReqHasntFaction.java
+++ b/src/main/java/com/massivecraft/factions/cmd/req/ReqHasntFaction.java
@@ -18,7 +18,7 @@ public class ReqHasntFaction extends RequirementAbstract {
     // INSTANCE & CONSTRUCT
     // -------------------------------------------- //
 
-    private static ReqHasntFaction i = new ReqHasntFaction();
+    private static final ReqHasntFaction i = new ReqHasntFaction();
 
     public static ReqHasntFaction get() {
         return i;
diff --git a/src/main/java/com/massivecraft/factions/cmd/req/ReqTaxEnabled.java b/src/main/java/com/massivecraft/factions/cmd/req/ReqTaxEnabled.java
index 7dae5623..e8688720 100644
--- a/src/main/java/com/massivecraft/factions/cmd/req/ReqTaxEnabled.java
+++ b/src/main/java/com/massivecraft/factions/cmd/req/ReqTaxEnabled.java
@@ -17,7 +17,7 @@ public class ReqTaxEnabled extends RequirementAbstract {
     // INSTANCE & CONSTRUCT
     // -------------------------------------------- //
 
-    private static ReqTaxEnabled i = new ReqTaxEnabled();
+    private static final ReqTaxEnabled i = new ReqTaxEnabled();
 
     public static ReqTaxEnabled get() {
         return i;
diff --git a/src/main/java/com/massivecraft/factions/cmd/type/TypeFaction.java b/src/main/java/com/massivecraft/factions/cmd/type/TypeFaction.java
index d7b05204..92be1ad0 100644
--- a/src/main/java/com/massivecraft/factions/cmd/type/TypeFaction.java
+++ b/src/main/java/com/massivecraft/factions/cmd/type/TypeFaction.java
@@ -21,7 +21,7 @@ public class TypeFaction extends TypeAbstract<Faction> {
     // INSTANCE & CONSTRUCT
     // -------------------------------------------- //
 
-    private static TypeFaction i = new TypeFaction();
+    private static final TypeFaction i = new TypeFaction();
 
     public static TypeFaction get() {
         return i;
diff --git a/src/main/java/com/massivecraft/factions/cmd/type/TypeFactionChunkChangeType.java b/src/main/java/com/massivecraft/factions/cmd/type/TypeFactionChunkChangeType.java
index 207149f5..14c4e47f 100644
--- a/src/main/java/com/massivecraft/factions/cmd/type/TypeFactionChunkChangeType.java
+++ b/src/main/java/com/massivecraft/factions/cmd/type/TypeFactionChunkChangeType.java
@@ -8,7 +8,7 @@ public class TypeFactionChunkChangeType extends TypeEnum<EventFactionsChunkChang
     // INSTANCE & CONSTRUCT
     // -------------------------------------------- //
 
-    private static TypeFactionChunkChangeType i = new TypeFactionChunkChangeType();
+    private static final TypeFactionChunkChangeType i = new TypeFactionChunkChangeType();
 
     public static TypeFactionChunkChangeType get() {
         return i;
diff --git a/src/main/java/com/massivecraft/factions/cmd/type/TypeFactionNameLenient.java b/src/main/java/com/massivecraft/factions/cmd/type/TypeFactionNameLenient.java
index c042fef1..58e4bee2 100644
--- a/src/main/java/com/massivecraft/factions/cmd/type/TypeFactionNameLenient.java
+++ b/src/main/java/com/massivecraft/factions/cmd/type/TypeFactionNameLenient.java
@@ -5,7 +5,7 @@ public class TypeFactionNameLenient extends TypeFactionNameAbstract {
     // INSTANCE & CONSTRUCT
     // -------------------------------------------- //
 
-    private static TypeFactionNameLenient i = new TypeFactionNameLenient();
+    private static final TypeFactionNameLenient i = new TypeFactionNameLenient();
 
     public static TypeFactionNameLenient get() {
         return i;
diff --git a/src/main/java/com/massivecraft/factions/cmd/type/TypeFactionNameStrict.java b/src/main/java/com/massivecraft/factions/cmd/type/TypeFactionNameStrict.java
index 5b790c97..eb7ae4cc 100644
--- a/src/main/java/com/massivecraft/factions/cmd/type/TypeFactionNameStrict.java
+++ b/src/main/java/com/massivecraft/factions/cmd/type/TypeFactionNameStrict.java
@@ -5,7 +5,7 @@ public class TypeFactionNameStrict extends TypeFactionNameAbstract {
     // INSTANCE & CONSTRUCT
     // -------------------------------------------- //
 
-    private static TypeFactionNameStrict i = new TypeFactionNameStrict();
+    private static final TypeFactionNameStrict i = new TypeFactionNameStrict();
 
     public static TypeFactionNameStrict get() {
         return i;
diff --git a/src/main/java/com/massivecraft/factions/cmd/type/TypeMFlag.java b/src/main/java/com/massivecraft/factions/cmd/type/TypeMFlag.java
index 97bbcb4f..2f1c7298 100644
--- a/src/main/java/com/massivecraft/factions/cmd/type/TypeMFlag.java
+++ b/src/main/java/com/massivecraft/factions/cmd/type/TypeMFlag.java
@@ -11,7 +11,7 @@ public class TypeMFlag extends TypeEntity<MFlag> {
     // INSTANCE & CONSTRUCT
     // -------------------------------------------- //
 
-    private static TypeMFlag i = new TypeMFlag();
+    private static final TypeMFlag i = new TypeMFlag();
 
     public static TypeMFlag get() {
         return i;
diff --git a/src/main/java/com/massivecraft/factions/cmd/type/TypeMPerm.java b/src/main/java/com/massivecraft/factions/cmd/type/TypeMPerm.java
index 8e857bad..ac3cadf5 100644
--- a/src/main/java/com/massivecraft/factions/cmd/type/TypeMPerm.java
+++ b/src/main/java/com/massivecraft/factions/cmd/type/TypeMPerm.java
@@ -11,7 +11,7 @@ public class TypeMPerm extends TypeEntity<MPerm> {
     // INSTANCE & CONSTRUCT
     // -------------------------------------------- //
 
-    private static TypeMPerm i = new TypeMPerm();
+    private static final TypeMPerm i = new TypeMPerm();
 
     public static TypeMPerm get() {
         return i;
diff --git a/src/main/java/com/massivecraft/factions/cmd/type/TypeMPermable.java b/src/main/java/com/massivecraft/factions/cmd/type/TypeMPermable.java
index de4612c1..92bb832c 100644
--- a/src/main/java/com/massivecraft/factions/cmd/type/TypeMPermable.java
+++ b/src/main/java/com/massivecraft/factions/cmd/type/TypeMPermable.java
@@ -20,7 +20,7 @@ public class TypeMPermable extends TypeAbstract<MPerm.MPermable> {
     // INSTANCE & CONSTRUCT
     // -------------------------------------------- //
 
-    private static TypeMPermable i = new TypeMPermable();
+    private static final TypeMPermable i = new TypeMPermable();
 
     public static TypeMPermable get() {
         return i;
diff --git a/src/main/java/com/massivecraft/factions/cmd/type/TypeRank.java b/src/main/java/com/massivecraft/factions/cmd/type/TypeRank.java
index fff348fa..f87d9c34 100644
--- a/src/main/java/com/massivecraft/factions/cmd/type/TypeRank.java
+++ b/src/main/java/com/massivecraft/factions/cmd/type/TypeRank.java
@@ -15,7 +15,7 @@ public class TypeRank extends TypeEntityInternalFaction<Rank> {
     // INSTANCE & CONSTRUCT
     // -------------------------------------------- //
 
-    private static TypeRank i = new TypeRank();
+    private static final TypeRank i = new TypeRank();
 
     public static TypeRank get() {
         return i;
diff --git a/src/main/java/com/massivecraft/factions/cmd/type/TypeRel.java b/src/main/java/com/massivecraft/factions/cmd/type/TypeRel.java
index 0db61a3a..e9fce0a4 100644
--- a/src/main/java/com/massivecraft/factions/cmd/type/TypeRel.java
+++ b/src/main/java/com/massivecraft/factions/cmd/type/TypeRel.java
@@ -10,7 +10,7 @@ public class TypeRel extends TypeEnum<Rel> {
     // INSTANCE & CONSTRUCT
     // -------------------------------------------- //
 
-    private static TypeRel i = new TypeRel();
+    private static final TypeRel i = new TypeRel();
 
     public static TypeRel get() {
         return i;
diff --git a/src/main/java/com/massivecraft/factions/cmd/type/TypeRelation.java b/src/main/java/com/massivecraft/factions/cmd/type/TypeRelation.java
index 2694a7b4..72d0cca5 100644
--- a/src/main/java/com/massivecraft/factions/cmd/type/TypeRelation.java
+++ b/src/main/java/com/massivecraft/factions/cmd/type/TypeRelation.java
@@ -7,7 +7,7 @@ public class TypeRelation extends TypeRel {
     // INSTANCE & CONSTRUCT
     // -------------------------------------------- //
 
-    private static TypeRelation i = new TypeRelation();
+    private static final TypeRelation i = new TypeRelation();
 
     public static TypeRelation get() {
         return i;
diff --git a/src/main/java/com/massivecraft/factions/cmd/type/TypeSortMPlayer.java b/src/main/java/com/massivecraft/factions/cmd/type/TypeSortMPlayer.java
index b1cf74fa..515c797b 100644
--- a/src/main/java/com/massivecraft/factions/cmd/type/TypeSortMPlayer.java
+++ b/src/main/java/com/massivecraft/factions/cmd/type/TypeSortMPlayer.java
@@ -13,7 +13,7 @@ public class TypeSortMPlayer extends TypeAbstractChoice<Comparator<MPlayer>> {
     // INSTANCE & CONSTRUCT
     // -------------------------------------------- //
 
-    private static TypeSortMPlayer i = new TypeSortMPlayer();
+    private static final TypeSortMPlayer i = new TypeSortMPlayer();
 
     public static TypeSortMPlayer get() {
         return i;
diff --git a/src/main/java/com/massivecraft/factions/cmd/type/TypeTaxable.java b/src/main/java/com/massivecraft/factions/cmd/type/TypeTaxable.java
index d1a8dbad..122c03fb 100644
--- a/src/main/java/com/massivecraft/factions/cmd/type/TypeTaxable.java
+++ b/src/main/java/com/massivecraft/factions/cmd/type/TypeTaxable.java
@@ -19,7 +19,7 @@ public class TypeTaxable extends TypeAbstract<String> {
     // INSTANCE & CONSTRUCT
     // -------------------------------------------- //
 
-    private static TypeTaxable i = new TypeTaxable();
+    private static final TypeTaxable i = new TypeTaxable();
 
     public static TypeTaxable get() {
         return i;
diff --git a/src/main/java/com/massivecraft/factions/cmd/type/TypeVote.java b/src/main/java/com/massivecraft/factions/cmd/type/TypeVote.java
index 6b9b9076..54624f66 100644
--- a/src/main/java/com/massivecraft/factions/cmd/type/TypeVote.java
+++ b/src/main/java/com/massivecraft/factions/cmd/type/TypeVote.java
@@ -10,7 +10,7 @@ public class TypeVote extends TypeEntityInternalFaction<Vote> {
     // INSTANCE & CONSTRUCT
     // -------------------------------------------- //
 
-    private static TypeVote i = new TypeVote();
+    private static final TypeVote i = new TypeVote();
 
     public static TypeVote get() {
         return i;
diff --git a/src/main/java/com/massivecraft/factions/cmd/type/TypeWarp.java b/src/main/java/com/massivecraft/factions/cmd/type/TypeWarp.java
index f6246d6b..926896f0 100644
--- a/src/main/java/com/massivecraft/factions/cmd/type/TypeWarp.java
+++ b/src/main/java/com/massivecraft/factions/cmd/type/TypeWarp.java
@@ -10,7 +10,7 @@ public class TypeWarp extends TypeEntityInternalFaction<Warp> {
     // INSTANCE & CONSTRUCT
     // -------------------------------------------- //
 
-    private static TypeWarp i = new TypeWarp();
+    private static final TypeWarp i = new TypeWarp();
 
     public static TypeWarp get() {
         return i;
diff --git a/src/main/java/com/massivecraft/factions/comparator/ComparatorMPlayerInactivity.java b/src/main/java/com/massivecraft/factions/comparator/ComparatorMPlayerInactivity.java
index 285abb55..71791858 100644
--- a/src/main/java/com/massivecraft/factions/comparator/ComparatorMPlayerInactivity.java
+++ b/src/main/java/com/massivecraft/factions/comparator/ComparatorMPlayerInactivity.java
@@ -9,7 +9,7 @@ public class ComparatorMPlayerInactivity extends ComparatorAbstract<MPlayer> imp
     // INSTANCE & CONSTRUCT
     // -------------------------------------------- //
 
-    private static ComparatorMPlayerInactivity i = new ComparatorMPlayerInactivity();
+    private static final ComparatorMPlayerInactivity i = new ComparatorMPlayerInactivity();
 
     public static ComparatorMPlayerInactivity get() {
         return i;
diff --git a/src/main/java/com/massivecraft/factions/comparator/ComparatorMPlayerPower.java b/src/main/java/com/massivecraft/factions/comparator/ComparatorMPlayerPower.java
index 05e19d4b..4b4ef442 100644
--- a/src/main/java/com/massivecraft/factions/comparator/ComparatorMPlayerPower.java
+++ b/src/main/java/com/massivecraft/factions/comparator/ComparatorMPlayerPower.java
@@ -9,7 +9,7 @@ public class ComparatorMPlayerPower extends ComparatorAbstract<MPlayer> implemen
     // INSTANCE & CONSTRUCT
     // -------------------------------------------- //
 
-    private static ComparatorMPlayerPower i = new ComparatorMPlayerPower();
+    private static final ComparatorMPlayerPower i = new ComparatorMPlayerPower();
 
     public static ComparatorMPlayerPower get() {
         return i;
diff --git a/src/main/java/com/massivecraft/factions/comparator/ComparatorMPlayerRole.java b/src/main/java/com/massivecraft/factions/comparator/ComparatorMPlayerRole.java
index 04a37aa2..f3fc0261 100644
--- a/src/main/java/com/massivecraft/factions/comparator/ComparatorMPlayerRole.java
+++ b/src/main/java/com/massivecraft/factions/comparator/ComparatorMPlayerRole.java
@@ -10,7 +10,7 @@ public class ComparatorMPlayerRole extends ComparatorAbstract<MPlayer> implement
     // INSTANCE & CONSTRUCT
     // -------------------------------------------- //
 
-    private static ComparatorMPlayerRole i = new ComparatorMPlayerRole();
+    private static final ComparatorMPlayerRole i = new ComparatorMPlayerRole();
 
     public static ComparatorMPlayerRole get() {
         return i;
diff --git a/src/main/java/com/massivecraft/factions/engine/EngineCanCombatHappen.java b/src/main/java/com/massivecraft/factions/engine/EngineCanCombatHappen.java
index e07672dd..469a9063 100644
--- a/src/main/java/com/massivecraft/factions/engine/EngineCanCombatHappen.java
+++ b/src/main/java/com/massivecraft/factions/engine/EngineCanCombatHappen.java
@@ -32,7 +32,7 @@ public class EngineCanCombatHappen extends Engine {
     // INSTANCE & CONSTRUCT
     // -------------------------------------------- //
 
-    private static EngineCanCombatHappen i = new EngineCanCombatHappen();
+    private static final EngineCanCombatHappen i = new EngineCanCombatHappen();
 
     public static EngineCanCombatHappen get() {
         return i;
diff --git a/src/main/java/com/massivecraft/factions/engine/EngineChat.java b/src/main/java/com/massivecraft/factions/engine/EngineChat.java
index 97cdfc0b..7d1fb4d7 100644
--- a/src/main/java/com/massivecraft/factions/engine/EngineChat.java
+++ b/src/main/java/com/massivecraft/factions/engine/EngineChat.java
@@ -27,7 +27,7 @@ public class EngineChat extends Engine {
     // INSTANCE & CONSTRUCT
     // -------------------------------------------- //
 
-    private static EngineChat i = new EngineChat();
+    private static final EngineChat i = new EngineChat();
 
     public static EngineChat get() {
         return i;
diff --git a/src/main/java/com/massivecraft/factions/engine/EngineChunkChange.java b/src/main/java/com/massivecraft/factions/engine/EngineChunkChange.java
index 85bfb088..75daf5cb 100644
--- a/src/main/java/com/massivecraft/factions/engine/EngineChunkChange.java
+++ b/src/main/java/com/massivecraft/factions/engine/EngineChunkChange.java
@@ -30,7 +30,7 @@ public class EngineChunkChange extends Engine {
     // INSTANCE & CONSTRUCT
     // -------------------------------------------- //
 
-    private static EngineChunkChange i = new EngineChunkChange();
+    private static final EngineChunkChange i = new EngineChunkChange();
 
     public static EngineChunkChange get() {
         return i;
diff --git a/src/main/java/com/massivecraft/factions/engine/EngineCleanInactivity.java b/src/main/java/com/massivecraft/factions/engine/EngineCleanInactivity.java
index 6447b6a8..dd900a13 100644
--- a/src/main/java/com/massivecraft/factions/engine/EngineCleanInactivity.java
+++ b/src/main/java/com/massivecraft/factions/engine/EngineCleanInactivity.java
@@ -17,7 +17,7 @@ public class EngineCleanInactivity extends Engine {
     // INSTANCE & CONSTRUCT
     // -------------------------------------------- //
 
-    private static EngineCleanInactivity i = new EngineCleanInactivity();
+    private static final EngineCleanInactivity i = new EngineCleanInactivity();
 
     public static EngineCleanInactivity get() {
         return i;
diff --git a/src/main/java/com/massivecraft/factions/engine/EngineDenyCommands.java b/src/main/java/com/massivecraft/factions/engine/EngineDenyCommands.java
index 274edc78..d91a49d8 100644
--- a/src/main/java/com/massivecraft/factions/engine/EngineDenyCommands.java
+++ b/src/main/java/com/massivecraft/factions/engine/EngineDenyCommands.java
@@ -22,7 +22,7 @@ public class EngineDenyCommands extends Engine {
     // INSTANCE & CONSTRUCT
     // -------------------------------------------- //
 
-    private static EngineDenyCommands i = new EngineDenyCommands();
+    private static final EngineDenyCommands i = new EngineDenyCommands();
 
     public static EngineDenyCommands get() {
         return i;
diff --git a/src/main/java/com/massivecraft/factions/engine/EngineDenyTeleport.java b/src/main/java/com/massivecraft/factions/engine/EngineDenyTeleport.java
index 13975966..c6121d75 100644
--- a/src/main/java/com/massivecraft/factions/engine/EngineDenyTeleport.java
+++ b/src/main/java/com/massivecraft/factions/engine/EngineDenyTeleport.java
@@ -25,7 +25,7 @@ public class EngineDenyTeleport extends Engine {
     // INSTANCE & CONSTRUCT
     // -------------------------------------------- //
 
-    private static EngineDenyTeleport i = new EngineDenyTeleport();
+    private static final EngineDenyTeleport i = new EngineDenyTeleport();
 
     public static EngineDenyTeleport get() {
         return i;
diff --git a/src/main/java/com/massivecraft/factions/engine/EngineEcon.java b/src/main/java/com/massivecraft/factions/engine/EngineEcon.java
index c1b8d490..998ec64e 100644
--- a/src/main/java/com/massivecraft/factions/engine/EngineEcon.java
+++ b/src/main/java/com/massivecraft/factions/engine/EngineEcon.java
@@ -39,7 +39,7 @@ public class EngineEcon extends Engine {
     // INSTANCE & CONSTRUCT
     // -------------------------------------------- //
 
-    private static EngineEcon i = new EngineEcon();
+    private static final EngineEcon i = new EngineEcon();
 
     public static EngineEcon get() {
         return i;
diff --git a/src/main/java/com/massivecraft/factions/engine/EngineExploit.java b/src/main/java/com/massivecraft/factions/engine/EngineExploit.java
index 58d79e56..0fb5dbf7 100644
--- a/src/main/java/com/massivecraft/factions/engine/EngineExploit.java
+++ b/src/main/java/com/massivecraft/factions/engine/EngineExploit.java
@@ -26,7 +26,7 @@ public class EngineExploit extends Engine {
     // INSTANCE & CONSTRUCT
     // -------------------------------------------- //
 
-    private static EngineExploit i = new EngineExploit();
+    private static final EngineExploit i = new EngineExploit();
 
     public static EngineExploit get() {
         return i;
@@ -104,7 +104,7 @@ public class EngineExploit extends Engine {
     private static final int NETHER_TRAP_RADIUS_CHECK = 5;
     private static final int NETHER_TRAP_RESET_RADIUS_SQUARED = 9;
 
-    private HashMap<UUID, List<Block>> portalTraps = new HashMap<>();
+    private final HashMap<UUID, List<Block>> portalTraps = new HashMap<>();
 
     @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
     public void portalTrapRemoveAnimation(PlayerTeleportEvent event) {
diff --git a/src/main/java/com/massivecraft/factions/engine/EngineFlagEndergrief.java b/src/main/java/com/massivecraft/factions/engine/EngineFlagEndergrief.java
index c01055bb..95044fd6 100644
--- a/src/main/java/com/massivecraft/factions/engine/EngineFlagEndergrief.java
+++ b/src/main/java/com/massivecraft/factions/engine/EngineFlagEndergrief.java
@@ -16,7 +16,7 @@ public class EngineFlagEndergrief extends Engine {
     // INSTANCE & CONSTRUCT
     // -------------------------------------------- //
 
-    private static EngineFlagEndergrief i = new EngineFlagEndergrief();
+    private static final EngineFlagEndergrief i = new EngineFlagEndergrief();
 
     public static EngineFlagEndergrief get() {
         return i;
diff --git a/src/main/java/com/massivecraft/factions/engine/EngineFlagExplosion.java b/src/main/java/com/massivecraft/factions/engine/EngineFlagExplosion.java
index d863d6c6..fc560601 100644
--- a/src/main/java/com/massivecraft/factions/engine/EngineFlagExplosion.java
+++ b/src/main/java/com/massivecraft/factions/engine/EngineFlagExplosion.java
@@ -32,7 +32,7 @@ public class EngineFlagExplosion extends Engine {
     // INSTANCE & CONSTRUCT
     // -------------------------------------------- //
 
-    private static EngineFlagExplosion i = new EngineFlagExplosion();
+    private static final EngineFlagExplosion i = new EngineFlagExplosion();
 
     public static EngineFlagExplosion get() {
         return i;
diff --git a/src/main/java/com/massivecraft/factions/engine/EngineFlagFireSpread.java b/src/main/java/com/massivecraft/factions/engine/EngineFlagFireSpread.java
index d67b9ed1..ecba69d4 100644
--- a/src/main/java/com/massivecraft/factions/engine/EngineFlagFireSpread.java
+++ b/src/main/java/com/massivecraft/factions/engine/EngineFlagFireSpread.java
@@ -20,7 +20,7 @@ public class EngineFlagFireSpread extends Engine {
     // INSTANCE & CONSTRUCT
     // -------------------------------------------- //
 
-    private static EngineFlagFireSpread i = new EngineFlagFireSpread();
+    private static final EngineFlagFireSpread i = new EngineFlagFireSpread();
 
     public static EngineFlagFireSpread get() {
         return i;
diff --git a/src/main/java/com/massivecraft/factions/engine/EngineFlagSpawn.java b/src/main/java/com/massivecraft/factions/engine/EngineFlagSpawn.java
index ff5b8c84..5774d02d 100644
--- a/src/main/java/com/massivecraft/factions/engine/EngineFlagSpawn.java
+++ b/src/main/java/com/massivecraft/factions/engine/EngineFlagSpawn.java
@@ -21,7 +21,7 @@ public class EngineFlagSpawn extends Engine {
     // INSTANCE & CONSTRUCT
     // -------------------------------------------- //
 
-    private static EngineFlagSpawn i = new EngineFlagSpawn();
+    private static final EngineFlagSpawn i = new EngineFlagSpawn();
 
     public static EngineFlagSpawn get() {
         return i;
diff --git a/src/main/java/com/massivecraft/factions/engine/EngineFlagZombiegrief.java b/src/main/java/com/massivecraft/factions/engine/EngineFlagZombiegrief.java
index c71ad9d9..5e6e7a18 100644
--- a/src/main/java/com/massivecraft/factions/engine/EngineFlagZombiegrief.java
+++ b/src/main/java/com/massivecraft/factions/engine/EngineFlagZombiegrief.java
@@ -16,7 +16,7 @@ public class EngineFlagZombiegrief extends Engine {
     // INSTANCE & CONSTRUCT
     // -------------------------------------------- //
 
-    private static EngineFlagZombiegrief i = new EngineFlagZombiegrief();
+    private static final EngineFlagZombiegrief i = new EngineFlagZombiegrief();
 
     public static EngineFlagZombiegrief get() {
         return i;
diff --git a/src/main/java/com/massivecraft/factions/engine/EngineFly.java b/src/main/java/com/massivecraft/factions/engine/EngineFly.java
index c0b17bc4..a1759ba8 100644
--- a/src/main/java/com/massivecraft/factions/engine/EngineFly.java
+++ b/src/main/java/com/massivecraft/factions/engine/EngineFly.java
@@ -30,7 +30,7 @@ public class EngineFly extends Engine {
     // INSTANCE & CONSTRUCT
     // -------------------------------------------- //
 
-    private static EngineFly i = new EngineFly();
+    private static final EngineFly i = new EngineFly();
 
     public static EngineFly get() {
         return i;
diff --git a/src/main/java/com/massivecraft/factions/engine/EngineLastActivity.java b/src/main/java/com/massivecraft/factions/engine/EngineLastActivity.java
index addb3a35..ce17a546 100644
--- a/src/main/java/com/massivecraft/factions/engine/EngineLastActivity.java
+++ b/src/main/java/com/massivecraft/factions/engine/EngineLastActivity.java
@@ -16,7 +16,7 @@ public class EngineLastActivity extends Engine {
     // INSTANCE & CONSTRUCT
     // -------------------------------------------- //
 
-    private static EngineLastActivity i = new EngineLastActivity();
+    private static final EngineLastActivity i = new EngineLastActivity();
 
     public static EngineLastActivity get() {
         return i;
diff --git a/src/main/java/com/massivecraft/factions/engine/EngineMotd.java b/src/main/java/com/massivecraft/factions/engine/EngineMotd.java
index a5af3d92..c02bb57e 100644
--- a/src/main/java/com/massivecraft/factions/engine/EngineMotd.java
+++ b/src/main/java/com/massivecraft/factions/engine/EngineMotd.java
@@ -21,7 +21,7 @@ public class EngineMotd extends Engine {
     // INSTANCE & CONSTRUCT
     // -------------------------------------------- //
 
-    private static EngineMotd i = new EngineMotd();
+    private static final EngineMotd i = new EngineMotd();
 
     public static EngineMotd get() {
         return i;
diff --git a/src/main/java/com/massivecraft/factions/engine/EngineMoveChunk.java b/src/main/java/com/massivecraft/factions/engine/EngineMoveChunk.java
index d37576e7..c19dfef9 100644
--- a/src/main/java/com/massivecraft/factions/engine/EngineMoveChunk.java
+++ b/src/main/java/com/massivecraft/factions/engine/EngineMoveChunk.java
@@ -24,7 +24,7 @@ public class EngineMoveChunk extends Engine {
     // INSTANCE & CONSTRUCT
     // -------------------------------------------- //
 
-    private static EngineMoveChunk i = new EngineMoveChunk();
+    private static final EngineMoveChunk i = new EngineMoveChunk();
 
     public static EngineMoveChunk get() {
         return i;
diff --git a/src/main/java/com/massivecraft/factions/engine/EnginePermBuild.java b/src/main/java/com/massivecraft/factions/engine/EnginePermBuild.java
index fb3a36e7..4a93bf08 100644
--- a/src/main/java/com/massivecraft/factions/engine/EnginePermBuild.java
+++ b/src/main/java/com/massivecraft/factions/engine/EnginePermBuild.java
@@ -53,7 +53,7 @@ public class EnginePermBuild extends Engine {
     // INSTANCE & CONSTRUCT
     // -------------------------------------------- //
 
-    private static EnginePermBuild i = new EnginePermBuild();
+    private static final EnginePermBuild i = new EnginePermBuild();
 
     public static EnginePermBuild get() {
         return i;
diff --git a/src/main/java/com/massivecraft/factions/engine/EnginePlayerData.java b/src/main/java/com/massivecraft/factions/engine/EnginePlayerData.java
index 5613f42c..10f5a508 100644
--- a/src/main/java/com/massivecraft/factions/engine/EnginePlayerData.java
+++ b/src/main/java/com/massivecraft/factions/engine/EnginePlayerData.java
@@ -14,7 +14,7 @@ public class EnginePlayerData extends Engine {
     // INSTANCE & CONSTRUCT
     // -------------------------------------------- //
 
-    private static EnginePlayerData i = new EnginePlayerData();
+    private static final EnginePlayerData i = new EnginePlayerData();
 
     public static EnginePlayerData get() {
         return i;
diff --git a/src/main/java/com/massivecraft/factions/engine/EnginePower.java b/src/main/java/com/massivecraft/factions/engine/EnginePower.java
index d2b0650c..96414a9d 100644
--- a/src/main/java/com/massivecraft/factions/engine/EnginePower.java
+++ b/src/main/java/com/massivecraft/factions/engine/EnginePower.java
@@ -21,7 +21,7 @@ public class EnginePower extends Engine {
     // INSTANCE & CONSTRUCT
     // -------------------------------------------- //
 
-    private static EnginePower i = new EnginePower();
+    private static final EnginePower i = new EnginePower();
 
     public static EnginePower get() {
         return i;
diff --git a/src/main/java/com/massivecraft/factions/engine/EngineSeeChunk.java b/src/main/java/com/massivecraft/factions/engine/EngineSeeChunk.java
index 6200b646..6c4b7fb7 100644
--- a/src/main/java/com/massivecraft/factions/engine/EngineSeeChunk.java
+++ b/src/main/java/com/massivecraft/factions/engine/EngineSeeChunk.java
@@ -24,7 +24,7 @@ public class EngineSeeChunk extends Engine {
     // INSTANCE & CONSTRUCT
     // -------------------------------------------- //
 
-    private static EngineSeeChunk i = new EngineSeeChunk();
+    private static final EngineSeeChunk i = new EngineSeeChunk();
 
     public static EngineSeeChunk get() {
         return i;
diff --git a/src/main/java/com/massivecraft/factions/engine/EngineShow.java b/src/main/java/com/massivecraft/factions/engine/EngineShow.java
index 349a4bf8..31b43a03 100644
--- a/src/main/java/com/massivecraft/factions/engine/EngineShow.java
+++ b/src/main/java/com/massivecraft/factions/engine/EngineShow.java
@@ -56,7 +56,7 @@ public class EngineShow extends Engine {
     // INSTANCE & CONSTRUCT
     // -------------------------------------------- //
 
-    private static EngineShow i = new EngineShow();
+    private static final EngineShow i = new EngineShow();
 
     public static EngineShow get() {
         return i;
diff --git a/src/main/java/com/massivecraft/factions/engine/EngineTeleportHomeOnDeath.java b/src/main/java/com/massivecraft/factions/engine/EngineTeleportHomeOnDeath.java
index 7bd629f2..46193cf0 100644
--- a/src/main/java/com/massivecraft/factions/engine/EngineTeleportHomeOnDeath.java
+++ b/src/main/java/com/massivecraft/factions/engine/EngineTeleportHomeOnDeath.java
@@ -19,7 +19,7 @@ public class EngineTeleportHomeOnDeath extends Engine {
     // INSTANCE & CONSTRUCT
     // -------------------------------------------- //
 
-    private static EngineTeleportHomeOnDeath i = new EngineTeleportHomeOnDeath();
+    private static final EngineTeleportHomeOnDeath i = new EngineTeleportHomeOnDeath();
 
     public static EngineTeleportHomeOnDeath get() {
         return i;
diff --git a/src/main/java/com/massivecraft/factions/engine/EngineTerritoryShield.java b/src/main/java/com/massivecraft/factions/engine/EngineTerritoryShield.java
index 71a956fe..37f1f59e 100644
--- a/src/main/java/com/massivecraft/factions/engine/EngineTerritoryShield.java
+++ b/src/main/java/com/massivecraft/factions/engine/EngineTerritoryShield.java
@@ -17,7 +17,7 @@ public class EngineTerritoryShield extends Engine {
     // INSTANCE & CONSTRUCT
     // -------------------------------------------- //
 
-    private static EngineTerritoryShield i = new EngineTerritoryShield();
+    private static final EngineTerritoryShield i = new EngineTerritoryShield();
 
     public static EngineTerritoryShield get() {
         return i;
diff --git a/src/main/java/com/massivecraft/factions/engine/EngineVisualizations.java b/src/main/java/com/massivecraft/factions/engine/EngineVisualizations.java
index f448114d..7c686660 100644
--- a/src/main/java/com/massivecraft/factions/engine/EngineVisualizations.java
+++ b/src/main/java/com/massivecraft/factions/engine/EngineVisualizations.java
@@ -12,7 +12,7 @@ public class EngineVisualizations extends Engine {
     // INSTANCE & CONSTRUCT
     // -------------------------------------------- //
 
-    private static EngineVisualizations i = new EngineVisualizations();
+    private static final EngineVisualizations i = new EngineVisualizations();
 
     public static EngineVisualizations get() {
         return i;
diff --git a/src/main/java/com/massivecraft/factions/entity/BoardColl.java b/src/main/java/com/massivecraft/factions/entity/BoardColl.java
index f61e0b8e..2da6d745 100644
--- a/src/main/java/com/massivecraft/factions/entity/BoardColl.java
+++ b/src/main/java/com/massivecraft/factions/entity/BoardColl.java
@@ -22,7 +22,7 @@ public class BoardColl extends Coll<Board> implements BoardInterface {
     // INSTANCE & CONSTRUCT
     // -------------------------------------------- //
 
-    private static BoardColl i = new BoardColl();
+    private static final BoardColl i = new BoardColl();
 
     public static BoardColl get() {
         return i;
diff --git a/src/main/java/com/massivecraft/factions/entity/FactionColl.java b/src/main/java/com/massivecraft/factions/entity/FactionColl.java
index 26403a38..12e704a3 100644
--- a/src/main/java/com/massivecraft/factions/entity/FactionColl.java
+++ b/src/main/java/com/massivecraft/factions/entity/FactionColl.java
@@ -18,7 +18,7 @@ public class FactionColl extends Coll<Faction> {
     // INSTANCE & CONSTRUCT
     // -------------------------------------------- //
 
-    private static FactionColl i = new FactionColl();
+    private static final FactionColl i = new FactionColl();
 
     public static FactionColl get() {
         return i;
diff --git a/src/main/java/com/massivecraft/factions/entity/MConfColl.java b/src/main/java/com/massivecraft/factions/entity/MConfColl.java
index c174416d..c342ef83 100644
--- a/src/main/java/com/massivecraft/factions/entity/MConfColl.java
+++ b/src/main/java/com/massivecraft/factions/entity/MConfColl.java
@@ -8,7 +8,7 @@ public class MConfColl extends Coll<MConf> {
     // INSTANCE & CONSTRUCT
     // -------------------------------------------- //
 
-    private static MConfColl i = new MConfColl();
+    private static final MConfColl i = new MConfColl();
 
     public static MConfColl get() {
         return i;
diff --git a/src/main/java/com/massivecraft/factions/entity/MFlagColl.java b/src/main/java/com/massivecraft/factions/entity/MFlagColl.java
index 9cb8b3ed..2ad8dbe6 100644
--- a/src/main/java/com/massivecraft/factions/entity/MFlagColl.java
+++ b/src/main/java/com/massivecraft/factions/entity/MFlagColl.java
@@ -10,7 +10,7 @@ public class MFlagColl extends Coll<MFlag> {
     // INSTANCE & CONSTRUCT
     // -------------------------------------------- //
 
-    private static MFlagColl i = new MFlagColl();
+    private static final MFlagColl i = new MFlagColl();
 
     public static MFlagColl get() {
         return i;
diff --git a/src/main/java/com/massivecraft/factions/entity/MPermColl.java b/src/main/java/com/massivecraft/factions/entity/MPermColl.java
index 51d609c2..0f984119 100644
--- a/src/main/java/com/massivecraft/factions/entity/MPermColl.java
+++ b/src/main/java/com/massivecraft/factions/entity/MPermColl.java
@@ -13,7 +13,7 @@ public class MPermColl extends Coll<MPerm> {
     // INSTANCE & CONSTRUCT
     // -------------------------------------------- //
 
-    private static MPermColl i = new MPermColl();
+    private static final MPermColl i = new MPermColl();
 
     public static MPermColl get() {
         return i;
diff --git a/src/main/java/com/massivecraft/factions/entity/MPlayerColl.java b/src/main/java/com/massivecraft/factions/entity/MPlayerColl.java
index 097db452..8d26d4d6 100644
--- a/src/main/java/com/massivecraft/factions/entity/MPlayerColl.java
+++ b/src/main/java/com/massivecraft/factions/entity/MPlayerColl.java
@@ -7,7 +7,7 @@ public class MPlayerColl extends SenderColl<MPlayer> {
     // INSTANCE & CONSTRUCT
     // -------------------------------------------- //
 
-    private static MPlayerColl i = new MPlayerColl();
+    private static final MPlayerColl i = new MPlayerColl();
 
     public static MPlayerColl get() {
         return i;
diff --git a/src/main/java/com/massivecraft/factions/entity/Vote.java b/src/main/java/com/massivecraft/factions/entity/Vote.java
index cbb8f5ce..56d5a0bf 100644
--- a/src/main/java/com/massivecraft/factions/entity/Vote.java
+++ b/src/main/java/com/massivecraft/factions/entity/Vote.java
@@ -41,7 +41,7 @@ public class Vote extends EntityInternal<Vote> implements Named {
         return this.creationMillis;
     }
 
-    private String name;
+    private final String name;
 
     @Override
     public String getName() {
diff --git a/src/main/java/com/massivecraft/factions/entity/migrator/MigratorFaction001Invitations.java b/src/main/java/com/massivecraft/factions/entity/migrator/MigratorFaction001Invitations.java
index 1ac09888..80fc6a40 100644
--- a/src/main/java/com/massivecraft/factions/entity/migrator/MigratorFaction001Invitations.java
+++ b/src/main/java/com/massivecraft/factions/entity/migrator/MigratorFaction001Invitations.java
@@ -12,7 +12,7 @@ public class MigratorFaction001Invitations extends MigratorRoot {
     // INSTANCE & CONSTRUCT
     // -------------------------------------------- //
 
-    private static com.massivecraft.factions.entity.migrator.MigratorFaction001Invitations i = new com.massivecraft.factions.entity.migrator.MigratorFaction001Invitations();
+    private static final com.massivecraft.factions.entity.migrator.MigratorFaction001Invitations i = new com.massivecraft.factions.entity.migrator.MigratorFaction001Invitations();
 
     public static com.massivecraft.factions.entity.migrator.MigratorFaction001Invitations get() {
         return i;
diff --git a/src/main/java/com/massivecraft/factions/entity/migrator/MigratorFaction002Ranks.java b/src/main/java/com/massivecraft/factions/entity/migrator/MigratorFaction002Ranks.java
index 38ebc617..cfcafc20 100644
--- a/src/main/java/com/massivecraft/factions/entity/migrator/MigratorFaction002Ranks.java
+++ b/src/main/java/com/massivecraft/factions/entity/migrator/MigratorFaction002Ranks.java
@@ -22,7 +22,7 @@ public class MigratorFaction002Ranks extends MigratorRoot {
     // INSTANCE & CONSTRUCT
     // -------------------------------------------- //
 
-    private static MigratorFaction002Ranks i = new MigratorFaction002Ranks();
+    private static final MigratorFaction002Ranks i = new MigratorFaction002Ranks();
 
     public static MigratorFaction002Ranks get() {
         return i;
diff --git a/src/main/java/com/massivecraft/factions/entity/migrator/MigratorFaction003Warps.java b/src/main/java/com/massivecraft/factions/entity/migrator/MigratorFaction003Warps.java
index 0432829c..f4eb97e3 100644
--- a/src/main/java/com/massivecraft/factions/entity/migrator/MigratorFaction003Warps.java
+++ b/src/main/java/com/massivecraft/factions/entity/migrator/MigratorFaction003Warps.java
@@ -18,7 +18,7 @@ public class MigratorFaction003Warps extends MigratorRoot {
     // INSTANCE & CONSTRUCT
     // -------------------------------------------- //
 
-    private static MigratorFaction003Warps i = new MigratorFaction003Warps();
+    private static final MigratorFaction003Warps i = new MigratorFaction003Warps();
 
     public static MigratorFaction003Warps get() {
         return i;
diff --git a/src/main/java/com/massivecraft/factions/entity/migrator/MigratorFaction004WarpsPerms.java b/src/main/java/com/massivecraft/factions/entity/migrator/MigratorFaction004WarpsPerms.java
index 3b34a097..ab22c071 100644
--- a/src/main/java/com/massivecraft/factions/entity/migrator/MigratorFaction004WarpsPerms.java
+++ b/src/main/java/com/massivecraft/factions/entity/migrator/MigratorFaction004WarpsPerms.java
@@ -10,7 +10,7 @@ public class MigratorFaction004WarpsPerms extends MigratorRoot {
     // INSTANCE & CONSTRUCT
     // -------------------------------------------- //
 
-    private static MigratorFaction004WarpsPerms i = new MigratorFaction004WarpsPerms();
+    private static final MigratorFaction004WarpsPerms i = new MigratorFaction004WarpsPerms();
 
     public static MigratorFaction004WarpsPerms get() {
         return i;
diff --git a/src/main/java/com/massivecraft/factions/entity/migrator/MigratorMConf001EnumerationUtil.java b/src/main/java/com/massivecraft/factions/entity/migrator/MigratorMConf001EnumerationUtil.java
index 8be8869e..6e27e502 100644
--- a/src/main/java/com/massivecraft/factions/entity/migrator/MigratorMConf001EnumerationUtil.java
+++ b/src/main/java/com/massivecraft/factions/entity/migrator/MigratorMConf001EnumerationUtil.java
@@ -16,7 +16,7 @@ public class MigratorMConf001EnumerationUtil extends MigratorRoot {
     // INSTANCE & CONSTRUCT
     // -------------------------------------------- //
 
-    private static MigratorMConf001EnumerationUtil i = new MigratorMConf001EnumerationUtil();
+    private static final MigratorMConf001EnumerationUtil i = new MigratorMConf001EnumerationUtil();
 
     public static MigratorMConf001EnumerationUtil get() {
         return i;
diff --git a/src/main/java/com/massivecraft/factions/entity/migrator/MigratorMConf002CleanInactivity.java b/src/main/java/com/massivecraft/factions/entity/migrator/MigratorMConf002CleanInactivity.java
index c3c8518e..20dcc98f 100644
--- a/src/main/java/com/massivecraft/factions/entity/migrator/MigratorMConf002CleanInactivity.java
+++ b/src/main/java/com/massivecraft/factions/entity/migrator/MigratorMConf002CleanInactivity.java
@@ -9,7 +9,7 @@ public class MigratorMConf002CleanInactivity extends MigratorRoot {
     // INSTANCE & CONSTRUCT
     // -------------------------------------------- //
 
-    private static MigratorMConf002CleanInactivity i = new MigratorMConf002CleanInactivity();
+    private static final MigratorMConf002CleanInactivity i = new MigratorMConf002CleanInactivity();
 
     public static MigratorMConf002CleanInactivity get() {
         return i;
diff --git a/src/main/java/com/massivecraft/factions/entity/migrator/MigratorMConf003CleanInactivity.java b/src/main/java/com/massivecraft/factions/entity/migrator/MigratorMConf003CleanInactivity.java
index 60bde75a..60b7b0c3 100644
--- a/src/main/java/com/massivecraft/factions/entity/migrator/MigratorMConf003CleanInactivity.java
+++ b/src/main/java/com/massivecraft/factions/entity/migrator/MigratorMConf003CleanInactivity.java
@@ -9,7 +9,7 @@ public class MigratorMConf003CleanInactivity extends MigratorRoot {
     // INSTANCE & CONSTRUCT
     // -------------------------------------------- //
 
-    private static MigratorMConf003CleanInactivity i = new MigratorMConf003CleanInactivity();
+    private static final MigratorMConf003CleanInactivity i = new MigratorMConf003CleanInactivity();
 
     public static MigratorMConf003CleanInactivity get() {
         return i;
diff --git a/src/main/java/com/massivecraft/factions/entity/migrator/MigratorMConf004Rank.java b/src/main/java/com/massivecraft/factions/entity/migrator/MigratorMConf004Rank.java
index 6eebb0c5..f8e1d1c6 100644
--- a/src/main/java/com/massivecraft/factions/entity/migrator/MigratorMConf004Rank.java
+++ b/src/main/java/com/massivecraft/factions/entity/migrator/MigratorMConf004Rank.java
@@ -13,7 +13,7 @@ public class MigratorMConf004Rank extends MigratorRoot {
     // INSTANCE & CONSTRUCT
     // -------------------------------------------- //
 
-    private static MigratorMConf004Rank i = new MigratorMConf004Rank();
+    private static final MigratorMConf004Rank i = new MigratorMConf004Rank();
 
     public static MigratorMConf004Rank get() {
         return i;
diff --git a/src/main/java/com/massivecraft/factions/entity/migrator/MigratorMConf005Warps.java b/src/main/java/com/massivecraft/factions/entity/migrator/MigratorMConf005Warps.java
index b02eb3bf..0d2e20fc 100644
--- a/src/main/java/com/massivecraft/factions/entity/migrator/MigratorMConf005Warps.java
+++ b/src/main/java/com/massivecraft/factions/entity/migrator/MigratorMConf005Warps.java
@@ -9,7 +9,7 @@ public class MigratorMConf005Warps extends MigratorRoot {
     // INSTANCE & CONSTRUCT
     // -------------------------------------------- //
 
-    private static MigratorMConf005Warps i = new MigratorMConf005Warps();
+    private static final MigratorMConf005Warps i = new MigratorMConf005Warps();
 
     public static MigratorMConf005Warps get() {
         return i;
diff --git a/src/main/java/com/massivecraft/factions/entity/migrator/MigratorMPerm001Warps.java b/src/main/java/com/massivecraft/factions/entity/migrator/MigratorMPerm001Warps.java
index 1e5b0795..ea49efbf 100644
--- a/src/main/java/com/massivecraft/factions/entity/migrator/MigratorMPerm001Warps.java
+++ b/src/main/java/com/massivecraft/factions/entity/migrator/MigratorMPerm001Warps.java
@@ -10,7 +10,7 @@ public class MigratorMPerm001Warps extends MigratorRoot {
     // INSTANCE & CONSTRUCT
     // -------------------------------------------- //
 
-    private static MigratorMPerm001Warps i = new MigratorMPerm001Warps();
+    private static final MigratorMPerm001Warps i = new MigratorMPerm001Warps();
 
     public static MigratorMPerm001Warps get() {
         return i;
diff --git a/src/main/java/com/massivecraft/factions/entity/migrator/MigratorMPerm002MoveStandard.java b/src/main/java/com/massivecraft/factions/entity/migrator/MigratorMPerm002MoveStandard.java
index 7fcf5b1c..b15bf04f 100644
--- a/src/main/java/com/massivecraft/factions/entity/migrator/MigratorMPerm002MoveStandard.java
+++ b/src/main/java/com/massivecraft/factions/entity/migrator/MigratorMPerm002MoveStandard.java
@@ -15,7 +15,7 @@ public class MigratorMPerm002MoveStandard extends MigratorRoot {
     // INSTANCE & CONSTRUCT
     // -------------------------------------------- //
 
-    private static MigratorMPerm002MoveStandard i = new MigratorMPerm002MoveStandard();
+    private static final MigratorMPerm002MoveStandard i = new MigratorMPerm002MoveStandard();
 
     public static MigratorMPerm002MoveStandard get() {
         return i;
diff --git a/src/main/java/com/massivecraft/factions/entity/migrator/MigratorMPlayer001Ranks.java b/src/main/java/com/massivecraft/factions/entity/migrator/MigratorMPlayer001Ranks.java
index fde704dc..9c282f3d 100644
--- a/src/main/java/com/massivecraft/factions/entity/migrator/MigratorMPlayer001Ranks.java
+++ b/src/main/java/com/massivecraft/factions/entity/migrator/MigratorMPlayer001Ranks.java
@@ -17,7 +17,7 @@ public class MigratorMPlayer001Ranks extends MigratorRoot {
     // INSTANCE & CONSTRUCT
     // -------------------------------------------- //
 
-    private static MigratorMPlayer001Ranks i = new MigratorMPlayer001Ranks();
+    private static final MigratorMPlayer001Ranks i = new MigratorMPlayer001Ranks();
 
     public static MigratorMPlayer001Ranks get() {
         return i;
diff --git a/src/main/java/com/massivecraft/factions/entity/migrator/MigratorMPlayer002UsingAdminMode.java b/src/main/java/com/massivecraft/factions/entity/migrator/MigratorMPlayer002UsingAdminMode.java
index 0e68df23..163b3b9d 100644
--- a/src/main/java/com/massivecraft/factions/entity/migrator/MigratorMPlayer002UsingAdminMode.java
+++ b/src/main/java/com/massivecraft/factions/entity/migrator/MigratorMPlayer002UsingAdminMode.java
@@ -9,7 +9,7 @@ public class MigratorMPlayer002UsingAdminMode extends MigratorRoot {
     // INSTANCE & CONSTRUCT
     // -------------------------------------------- //
 
-    private static MigratorMPlayer002UsingAdminMode i = new MigratorMPlayer002UsingAdminMode();
+    private static final MigratorMPlayer002UsingAdminMode i = new MigratorMPlayer002UsingAdminMode();
 
     public static MigratorMPlayer002UsingAdminMode get() {
         return i;
diff --git a/src/main/java/com/massivecraft/factions/entity/migrator/MigratorTerritoryAccess001Restructure.java b/src/main/java/com/massivecraft/factions/entity/migrator/MigratorTerritoryAccess001Restructure.java
index 9a99284d..dc7eaf50 100644
--- a/src/main/java/com/massivecraft/factions/entity/migrator/MigratorTerritoryAccess001Restructure.java
+++ b/src/main/java/com/massivecraft/factions/entity/migrator/MigratorTerritoryAccess001Restructure.java
@@ -12,7 +12,7 @@ public class MigratorTerritoryAccess001Restructure extends MigratorRoot {
     // INSTANCE & CONSTRUCT
     // -------------------------------------------- //
 
-    private static MigratorTerritoryAccess001Restructure i = new MigratorTerritoryAccess001Restructure();
+    private static final MigratorTerritoryAccess001Restructure i = new MigratorTerritoryAccess001Restructure();
 
     public static MigratorTerritoryAccess001Restructure get() {
         return i;
diff --git a/src/main/java/com/massivecraft/factions/integration/dynmap/EngineDynmap.java b/src/main/java/com/massivecraft/factions/integration/dynmap/EngineDynmap.java
index 49f0f3b7..de5ca0a9 100644
--- a/src/main/java/com/massivecraft/factions/integration/dynmap/EngineDynmap.java
+++ b/src/main/java/com/massivecraft/factions/integration/dynmap/EngineDynmap.java
@@ -43,7 +43,7 @@ public class EngineDynmap extends Engine {
     // INSTANCE & CONSTRUCT
     // -------------------------------------------- //
 
-    private static EngineDynmap i = new EngineDynmap();
+    private static final EngineDynmap i = new EngineDynmap();
 
     public static EngineDynmap get() {
         return i;
@@ -650,7 +650,7 @@ public class EngineDynmap extends Engine {
     }
 
     public static void logSevere(String msg) {
-        String message = ChatColor.RED.toString() + msg;
+        String message = ChatColor.RED + msg;
         Factions.get().log(message);
     }
 
diff --git a/src/main/java/com/massivecraft/factions/integration/dynmap/IntegrationDynmap.java b/src/main/java/com/massivecraft/factions/integration/dynmap/IntegrationDynmap.java
index d573e029..a202afae 100644
--- a/src/main/java/com/massivecraft/factions/integration/dynmap/IntegrationDynmap.java
+++ b/src/main/java/com/massivecraft/factions/integration/dynmap/IntegrationDynmap.java
@@ -33,7 +33,7 @@ public class IntegrationDynmap extends Integration {
     // INSTANCE & CONSTRUCT
     // -------------------------------------------- //
 
-    private static IntegrationDynmap i = new IntegrationDynmap();
+    private static final IntegrationDynmap i = new IntegrationDynmap();
 
     public static IntegrationDynmap get() {
         return i;
diff --git a/src/main/java/com/massivecraft/factions/integration/lockette/EngineLockette.java b/src/main/java/com/massivecraft/factions/integration/lockette/EngineLockette.java
index fe54998c..62db290c 100644
--- a/src/main/java/com/massivecraft/factions/integration/lockette/EngineLockette.java
+++ b/src/main/java/com/massivecraft/factions/integration/lockette/EngineLockette.java
@@ -20,7 +20,7 @@ public class EngineLockette extends Engine {
     // INSTANCE & CONSTRUCT
     // -------------------------------------------- //
 
-    private static EngineLockette i = new EngineLockette();
+    private static final EngineLockette i = new EngineLockette();
 
     public static EngineLockette get() {
         return i;
diff --git a/src/main/java/com/massivecraft/factions/integration/lockette/IntegrationLockette.java b/src/main/java/com/massivecraft/factions/integration/lockette/IntegrationLockette.java
index 122a66a4..7df7b864 100644
--- a/src/main/java/com/massivecraft/factions/integration/lockette/IntegrationLockette.java
+++ b/src/main/java/com/massivecraft/factions/integration/lockette/IntegrationLockette.java
@@ -8,7 +8,7 @@ public class IntegrationLockette extends Integration {
     // INSTANCE & CONSTRUCT
     // -------------------------------------------- //
 
-    private static IntegrationLockette i = new IntegrationLockette();
+    private static final IntegrationLockette i = new IntegrationLockette();
 
     public static IntegrationLockette get() {
         return i;
diff --git a/src/main/java/com/massivecraft/factions/integration/lwc/EngineLwc.java b/src/main/java/com/massivecraft/factions/integration/lwc/EngineLwc.java
index 25348761..c3fa0c7a 100644
--- a/src/main/java/com/massivecraft/factions/integration/lwc/EngineLwc.java
+++ b/src/main/java/com/massivecraft/factions/integration/lwc/EngineLwc.java
@@ -27,7 +27,7 @@ public class EngineLwc extends Engine {
     // INSTANCE & CONSTRUCT
     // -------------------------------------------- //
 
-    private static EngineLwc i = new EngineLwc();
+    private static final EngineLwc i = new EngineLwc();
 
     public static EngineLwc get() {
         return i;
diff --git a/src/main/java/com/massivecraft/factions/integration/lwc/IntegrationLwc.java b/src/main/java/com/massivecraft/factions/integration/lwc/IntegrationLwc.java
index e313a1db..e28a2c28 100644
--- a/src/main/java/com/massivecraft/factions/integration/lwc/IntegrationLwc.java
+++ b/src/main/java/com/massivecraft/factions/integration/lwc/IntegrationLwc.java
@@ -8,7 +8,7 @@ public class IntegrationLwc extends Integration {
     // INSTANCE & CONSTRUCT
     // -------------------------------------------- //
 
-    private static IntegrationLwc i = new IntegrationLwc();
+    private static final IntegrationLwc i = new IntegrationLwc();
 
     public static IntegrationLwc get() {
         return i;
diff --git a/src/main/java/com/massivecraft/factions/integration/placeholderapi/IntegrationPlaceholderAPI.java b/src/main/java/com/massivecraft/factions/integration/placeholderapi/IntegrationPlaceholderAPI.java
index 87296785..96ecfdad 100644
--- a/src/main/java/com/massivecraft/factions/integration/placeholderapi/IntegrationPlaceholderAPI.java
+++ b/src/main/java/com/massivecraft/factions/integration/placeholderapi/IntegrationPlaceholderAPI.java
@@ -11,7 +11,7 @@ public class IntegrationPlaceholderAPI extends Integration {
     // INSTANCE & CONSTRUCT
     // -------------------------------------------- //
 
-    private static IntegrationPlaceholderAPI i = new IntegrationPlaceholderAPI();
+    private static final IntegrationPlaceholderAPI i = new IntegrationPlaceholderAPI();
 
     public static IntegrationPlaceholderAPI get() {
         return i;
diff --git a/src/main/java/com/massivecraft/factions/integration/placeholderapi/PlaceholderFactions.java b/src/main/java/com/massivecraft/factions/integration/placeholderapi/PlaceholderFactions.java
index fb27c9ba..4b33c3a7 100644
--- a/src/main/java/com/massivecraft/factions/integration/placeholderapi/PlaceholderFactions.java
+++ b/src/main/java/com/massivecraft/factions/integration/placeholderapi/PlaceholderFactions.java
@@ -13,7 +13,7 @@ public class PlaceholderFactions extends PlaceholderExpansion {
     // INSTANCE & CONSTRUCT
     // -------------------------------------------- //
 
-    private static PlaceholderFactions i = new PlaceholderFactions();
+    private static final PlaceholderFactions i = new PlaceholderFactions();
 
     public static PlaceholderFactions get() {
         return i;
diff --git a/src/main/java/com/massivecraft/factions/integration/venturechat/EngineVentureChat.java b/src/main/java/com/massivecraft/factions/integration/venturechat/EngineVentureChat.java
index 45373133..29e6df0a 100644
--- a/src/main/java/com/massivecraft/factions/integration/venturechat/EngineVentureChat.java
+++ b/src/main/java/com/massivecraft/factions/integration/venturechat/EngineVentureChat.java
@@ -20,7 +20,7 @@ public class EngineVentureChat extends Engine {
     // INSTANCE & CONSTRUCT
     // -------------------------------------------- //
 
-    private static EngineVentureChat i = new EngineVentureChat();
+    private static final EngineVentureChat i = new EngineVentureChat();
 
     public static EngineVentureChat get() {
         return i;
diff --git a/src/main/java/com/massivecraft/factions/integration/venturechat/IntegrationVentureChat.java b/src/main/java/com/massivecraft/factions/integration/venturechat/IntegrationVentureChat.java
index f6321926..85e3150a 100644
--- a/src/main/java/com/massivecraft/factions/integration/venturechat/IntegrationVentureChat.java
+++ b/src/main/java/com/massivecraft/factions/integration/venturechat/IntegrationVentureChat.java
@@ -8,7 +8,7 @@ public class IntegrationVentureChat extends Integration {
     // INSTANCE & CONSTRUCT
     // -------------------------------------------- //
 
-    private static IntegrationVentureChat i = new IntegrationVentureChat();
+    private static final IntegrationVentureChat i = new IntegrationVentureChat();
 
     public static IntegrationVentureChat get() {
         return i;
diff --git a/src/main/java/com/massivecraft/factions/integration/worldguard/EngineWorldGuard.java b/src/main/java/com/massivecraft/factions/integration/worldguard/EngineWorldGuard.java
index 54014c5e..cba8e4ed 100644
--- a/src/main/java/com/massivecraft/factions/integration/worldguard/EngineWorldGuard.java
+++ b/src/main/java/com/massivecraft/factions/integration/worldguard/EngineWorldGuard.java
@@ -28,7 +28,7 @@ public class EngineWorldGuard extends Engine {
     // INSTANCE & CONSTRUCT
     // -------------------------------------------- //
 
-    private static EngineWorldGuard i = new EngineWorldGuard();
+    private static final EngineWorldGuard i = new EngineWorldGuard();
 
     public static EngineWorldGuard get() {
         return i;
diff --git a/src/main/java/com/massivecraft/factions/integration/worldguard/IntegrationWorldGuard.java b/src/main/java/com/massivecraft/factions/integration/worldguard/IntegrationWorldGuard.java
index c22ce014..af004070 100644
--- a/src/main/java/com/massivecraft/factions/integration/worldguard/IntegrationWorldGuard.java
+++ b/src/main/java/com/massivecraft/factions/integration/worldguard/IntegrationWorldGuard.java
@@ -8,7 +8,7 @@ public class IntegrationWorldGuard extends Integration {
     // INSTANCE & CONSTRUCT
     // -------------------------------------------- //
 
-    private static IntegrationWorldGuard i = new IntegrationWorldGuard();
+    private static final IntegrationWorldGuard i = new IntegrationWorldGuard();
 
     public static IntegrationWorldGuard get() {
         return i;
diff --git a/src/main/java/com/massivecraft/factions/mixin/PowerMixin.java b/src/main/java/com/massivecraft/factions/mixin/PowerMixin.java
index 79aaae9d..f0a57517 100644
--- a/src/main/java/com/massivecraft/factions/mixin/PowerMixin.java
+++ b/src/main/java/com/massivecraft/factions/mixin/PowerMixin.java
@@ -10,7 +10,7 @@ public class PowerMixin extends Mixin {
     // -------------------------------------------- //
 
     private static PowerMixin d = new PowerMixin();
-    private static PowerMixin i = d;
+    private static final PowerMixin i = d;
 
     public static PowerMixin get() {
         return i;
diff --git a/src/main/java/com/massivecraft/factions/task/TaskFlagPermCreate.java b/src/main/java/com/massivecraft/factions/task/TaskFlagPermCreate.java
index 2765deb8..caaa7de3 100644
--- a/src/main/java/com/massivecraft/factions/task/TaskFlagPermCreate.java
+++ b/src/main/java/com/massivecraft/factions/task/TaskFlagPermCreate.java
@@ -16,7 +16,7 @@ public class TaskFlagPermCreate extends ModuloRepeatTask {
     // INSTANCE & CONSTRUCT
     // -------------------------------------------- //
 
-    private static TaskFlagPermCreate i = new TaskFlagPermCreate();
+    private static final TaskFlagPermCreate i = new TaskFlagPermCreate();
 
     public static TaskFlagPermCreate get() {
         return i;
diff --git a/src/main/java/com/massivecraft/factions/task/TaskPlayerPowerUpdate.java b/src/main/java/com/massivecraft/factions/task/TaskPlayerPowerUpdate.java
index bd055721..75aeca2e 100644
--- a/src/main/java/com/massivecraft/factions/task/TaskPlayerPowerUpdate.java
+++ b/src/main/java/com/massivecraft/factions/task/TaskPlayerPowerUpdate.java
@@ -19,7 +19,7 @@ public class TaskPlayerPowerUpdate extends ModuloRepeatTask {
     // INSTANCE
     // -------------------------------------------- //
 
-    private static TaskPlayerPowerUpdate i = new TaskPlayerPowerUpdate();
+    private static final TaskPlayerPowerUpdate i = new TaskPlayerPowerUpdate();
 
     public static TaskPlayerPowerUpdate get() {
         return i;
diff --git a/src/main/java/com/massivecraft/factions/task/TaskTax.java b/src/main/java/com/massivecraft/factions/task/TaskTax.java
index b3d67d79..65d8e597 100644
--- a/src/main/java/com/massivecraft/factions/task/TaskTax.java
+++ b/src/main/java/com/massivecraft/factions/task/TaskTax.java
@@ -28,7 +28,7 @@ public class TaskTax extends Task {
     // INSTANCE
     // -------------------------------------------- //
 
-    private static TaskTax i = new TaskTax();
+    private static final TaskTax i = new TaskTax();
 
     public static TaskTax get() {
         return i;