diff --git a/src/main/java/com/massivecraft/factions/Conf.java b/src/main/java/com/massivecraft/factions/Conf.java
index 39383305..ae457a7e 100644
--- a/src/main/java/com/massivecraft/factions/Conf.java
+++ b/src/main/java/com/massivecraft/factions/Conf.java
@@ -122,7 +122,7 @@ public class Conf {
     public static boolean useDisbandGUI = true;
 
     //SEALTH
-    public static boolean useSealthSystem = true;
+    public static boolean useStealthSystem = true;
 
     //STRIKES
     public static boolean useStrikeSystem = true;
diff --git a/src/main/java/com/massivecraft/factions/FactionsPlugin.java b/src/main/java/com/massivecraft/factions/FactionsPlugin.java
index 18c5b5a0..a72dac89 100755
--- a/src/main/java/com/massivecraft/factions/FactionsPlugin.java
+++ b/src/main/java/com/massivecraft/factions/FactionsPlugin.java
@@ -82,7 +82,7 @@ public class FactionsPlugin extends MPlugin {
     public boolean mc114 = false;
     public boolean mc115 = false;
     public boolean useNonPacketParticles = false;
-    public boolean factionsFlight = false;
+    public static boolean factionsFlight = false;
     public List<String> itemList = getConfig().getStringList("fchest.Items-Not-Allowed");
     SkriptAddon skriptAddon;
     private FactionsPlayerListener factionsPlayerListener;
@@ -453,37 +453,32 @@ public class FactionsPlugin extends MPlugin {
 
     @Override
     public void onDisable() {
-        super.onDisable();
-        timerManager.saveTimerData();
-        try {
-            String path = Paths.get(getDataFolder().getAbsolutePath()).toAbsolutePath().toString() + File.separator + "reserves.json";
-            File file = new File(path);
-            if (!file.exists()) {
-                file.getParentFile().mkdirs();
-                file.createNewFile();
-            }
-            Files.write(Paths.get(file.getPath()), getGsonBuilder().create().toJson(reserveObjects).getBytes());
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-
         // only save data if plugin actually completely loaded successfully
-        if (this.loadSuccessful) Conf.saveSync();
-
-
-        if (AutoLeaveTask != null) {
-            this.getServer().getScheduler().cancelTask(AutoLeaveTask);
-            AutoLeaveTask = null;
-        }
-        DiscordListener.saveGuilds();
-        if (Discord.jda != null) {
-            Discord.jda.shutdownNow();
-        }
-        try {
-            fLogManager.saveLogs();
-        } catch (Exception e) {
-            e.printStackTrace();
+        if (this.loadSuccessful) {
+            Conf.load();
+            Conf.saveSync();
+            timerManager.saveTimerData();
+            DiscordListener.saveGuilds();
+            if (Discord.jda != null) Discord.jda.shutdownNow();
+            try {
+                fLogManager.saveLogs();
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+            try {
+                String path = Paths.get(getDataFolder().getAbsolutePath()).toAbsolutePath().toString() + File.separator + "reserves.json";
+                File file = new File(path);
+                if (!file.exists()) {
+                    file.getParentFile().mkdirs();
+                    file.createNewFile();
+                }
+                Files.write(Paths.get(file.getPath()), getGsonBuilder().create().toJson(reserveObjects).getBytes());
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
         }
+        this.getServer().getScheduler().cancelTasks(this);
+        super.onDisable();
     }
 
     public void startAutoLeaveTask(boolean restartIfRunning) {
diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdDisband.java b/src/main/java/com/massivecraft/factions/cmd/CmdDisband.java
index 724ec327..71d487f5 100644
--- a/src/main/java/com/massivecraft/factions/cmd/CmdDisband.java
+++ b/src/main/java/com/massivecraft/factions/cmd/CmdDisband.java
@@ -101,14 +101,14 @@ public class CmdDisband extends FCommand {
                     String amountString = context.sender instanceof ConsoleCommandSender ? TL.GENERIC_SERVERADMIN.toString() : context.fPlayer.describeTo(follower);
                     if (follower.getFaction() == faction) {
                         follower.msg(TL.COMMAND_DISBAND_BROADCAST_YOURS, amountString);
-                        if (!follower.canFlyAtLocation() && FactionsPlugin.getInstance().getConfig().getBoolean("enable-faction-flight")) {
+                        if (!follower.canFlyAtLocation() && FactionsPlugin.factionsFlight) {
                             follower.setFFlying(false, false);
                         }
                     } else {
                         follower.msg(TL.COMMAND_DISBAND_BROADCAST_NOTYOURS, amountString, faction.getTag(follower));
                     }
                 }
-                if (FactionsPlugin.getInstance().getConfig().getBoolean("enable-faction-flight")) {
+                if (FactionsPlugin.factionsFlight) {
                     faction.disband(context.player, PlayerDisbandReason.COMMAND);
                     context.fPlayer.setFFlying(false, false);
                     Cooldown.setCooldown(context.fPlayer.getPlayer(), "disbandCooldown", FactionsPlugin.getInstance().getConfig().getInt("fcooldowns.f-disband"));
@@ -119,7 +119,7 @@ public class CmdDisband extends FCommand {
             }
             faction.disband(context.player, PlayerDisbandReason.COMMAND);
             Cooldown.setCooldown(context.fPlayer.getPlayer(), "disbandCooldown", FactionsPlugin.getInstance().getConfig().getInt("fcooldowns.f-disband"));
-            if (!context.fPlayer.canFlyAtLocation() && FactionsPlugin.getInstance().getConfig().getBoolean("enable-faction-flight")) {
+            if (!context.fPlayer.canFlyAtLocation() && FactionsPlugin.factionsFlight) {
                 context.fPlayer.setFFlying(false, false);
             }
         }
diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdReload.java b/src/main/java/com/massivecraft/factions/cmd/CmdReload.java
index 6655d6a0..4cdf3034 100644
--- a/src/main/java/com/massivecraft/factions/cmd/CmdReload.java
+++ b/src/main/java/com/massivecraft/factions/cmd/CmdReload.java
@@ -31,7 +31,7 @@ public class CmdReload extends FCommand {
 
 
         if (FactionsPlugin.getInstance().getConfig().getBoolean("enable-faction-flight", false)) {
-            FactionsPlugin.getInstance().factionsFlight = true;
+            FactionsPlugin.factionsFlight = true;
         }
 
         if (!FactionsPlugin.getInstance().mc17) {
diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdStealth.java b/src/main/java/com/massivecraft/factions/cmd/CmdStealth.java
index deb7428e..6f2bd53e 100644
--- a/src/main/java/com/massivecraft/factions/cmd/CmdStealth.java
+++ b/src/main/java/com/massivecraft/factions/cmd/CmdStealth.java
@@ -20,7 +20,7 @@ public class CmdStealth extends FCommand {
 
     @Override
     public void perform(CommandContext context) {
-        if (!Conf.useSealthSystem) {
+        if (!Conf.useStealthSystem) {
             context.msg(TL.GENERIC_DISABLED, "Factions Stealth");
             return;
         }
diff --git a/src/main/java/com/massivecraft/factions/listeners/FactionsPlayerListener.java b/src/main/java/com/massivecraft/factions/listeners/FactionsPlayerListener.java
index a9963a0a..870db485 100644
--- a/src/main/java/com/massivecraft/factions/listeners/FactionsPlayerListener.java
+++ b/src/main/java/com/massivecraft/factions/listeners/FactionsPlayerListener.java
@@ -572,7 +572,7 @@ public class FactionsPlayerListener implements Listener {
     }
     @Deprecated
     public void checkCanFly(FPlayer me) {
-        if (!FactionsPlugin.getInstance().getConfig().getBoolean("enable-faction-flight") || !FactionsPlugin.instance.getConfig().getBoolean("ffly.AutoEnable"))
+        if (!FactionsPlugin.factionsFlight || !FactionsPlugin.instance.getConfig().getBoolean("ffly.AutoEnable"))
             return;
         if (me.isFlying()) return;
         if (me.getPlayer().hasPermission(Permission.FLY_FLY.node)) {
diff --git a/src/main/java/com/massivecraft/factions/util/UtilFly.java b/src/main/java/com/massivecraft/factions/util/UtilFly.java
index b5ab004f..d5782526 100644
--- a/src/main/java/com/massivecraft/factions/util/UtilFly.java
+++ b/src/main/java/com/massivecraft/factions/util/UtilFly.java
@@ -15,7 +15,7 @@ public class UtilFly {
      */
     @Deprecated
     public static void run() {
-        if (!FactionsPlugin.getInstance().getConfig().getBoolean("enable-faction-flight"))
+        if (!FactionsPlugin.factionsFlight)
             return;
 
         Bukkit.getScheduler().scheduleSyncRepeatingTask(FactionsPlugin.getInstance(), () -> {
@@ -28,7 +28,7 @@ public class UtilFly {
 
     @Deprecated
     public static void setFly(FPlayer fp, boolean fly, boolean silent, boolean damage) {
-        if (!FactionsPlugin.getInstance().getConfig().getBoolean("enable-faction-flight"))
+        if (!FactionsPlugin.factionsFlight)
             return;
 
         fp.getPlayer().setAllowFlight(fly);
diff --git a/src/main/java/com/massivecraft/factions/zcore/MPlugin.java b/src/main/java/com/massivecraft/factions/zcore/MPlugin.java
index e5f560d7..9f1a5855 100644
--- a/src/main/java/com/massivecraft/factions/zcore/MPlugin.java
+++ b/src/main/java/com/massivecraft/factions/zcore/MPlugin.java
@@ -178,7 +178,6 @@ public abstract class MPlugin extends JavaPlugin {
     }
 
     public void onDisable() {
-        try {
             if (saveTask != null) {
                 this.getServer().getScheduler().cancelTask(saveTask);
                 saveTask = null;
@@ -190,8 +189,6 @@ public abstract class MPlugin extends JavaPlugin {
                 Board.getInstance().forceSave();
             }
             log("Disabled");
-        } catch (IllegalPluginAccessException e) {
-        }
     }
 
     // -------------------------------------------- //
diff --git a/src/main/java/com/massivecraft/factions/zcore/persist/MemoryFPlayer.java b/src/main/java/com/massivecraft/factions/zcore/persist/MemoryFPlayer.java
index e678d3d9..099112ff 100644
--- a/src/main/java/com/massivecraft/factions/zcore/persist/MemoryFPlayer.java
+++ b/src/main/java/com/massivecraft/factions/zcore/persist/MemoryFPlayer.java
@@ -961,7 +961,7 @@ public abstract class MemoryFPlayer implements FPlayer {
     }
 
     public void setFFlying(boolean fly, boolean damage) {
-        if (!FactionsPlugin.getInstance().getConfig().getBoolean("enable-faction-flight"))
+        if (!FactionsPlugin.factionsFlight)
             return;
 
         Player player = getPlayer();