diff --git a/conf/mod-mythic-plus.conf.dist b/conf/mod-mythic-plus.conf.dist
index a1dc59d..66f2576 100644
--- a/conf/mod-mythic-plus.conf.dist
+++ b/conf/mod-mythic-plus.conf.dist
@@ -53,17 +53,17 @@ MythicPlus.Legendary.DungeonBossSpell = 2.25
 MythicPlus.Legendary.DungeonBossArmor = 3.25
 MythicPlus.Legendary.DungeonBossLevel = 87
 
-MythicPlus.Legendary.DungeonHealth = 3.25
-MythicPlus.Legendary.DungeonMelee = 3.25
-MythicPlus.Legendary.DungeonSpell = 3.25
-MythicPlus.Legendary.DungeonArmor = 3.25
-MythicPlus.Legendary.DungeonAvgLevel = 87
+MythicPlus.Ascendant.DungeonHealth = 3.25
+MythicPlus.Ascendant.DungeonMelee = 3.25
+MythicPlus.Ascendant.DungeonSpell = 3.25
+MythicPlus.Ascendant.DungeonArmor = 3.25
+MythicPlus.Ascendant.DungeonAvgLevel = 87
 
-MythicPlus.Legendary.DugeonBossHealth = 3.25
-MythicPlus.Legendary.DugeonBossMelee = 3.25
-MythicPlus.Legendary.DugeonBossSpell = 3.25
-MythicPlus.Legendary.DugeonBossArmor = 3.25
-MythicPlus.Legendary.DugeonBossLevel = 90
+MythicPlus.Ascendant.DugeonBossHealth = 3.25
+MythicPlus.Ascendant.DugeonBossMelee = 3.25
+MythicPlus.Ascendant.DugeonBossSpell = 3.25
+MythicPlus.Ascendant.DugeonBossArmor = 3.25
+MythicPlus.Ascendant.DugeonBossLevel = 90
 
 ##########################################################
 #
diff --git a/src/CommandScript.cpp b/src/CommandScript.cpp
index 858ef2a..dabad22 100644
--- a/src/CommandScript.cpp
+++ b/src/CommandScript.cpp
@@ -88,17 +88,17 @@ public:
         return true;
     }
 
-    static bool HandleMythic(ChatHandler* handler, const std::vector<std::string>& args)
+    static bool HandleMythic(ChatHandler* handler, const std::vector<std::string>& /*args*/)
     {
         return HandleSetDifficulty(handler, std::vector<std::string>{"mythic"});
     }
 
-    static bool HandleLegendary(ChatHandler* handler, const std::vector<std::string>& args)
+    static bool HandleLegendary(ChatHandler* handler, const std::vector<std::string>& /*args*/)
     {
         return HandleSetDifficulty(handler, std::vector<std::string>{"legendary"});
     }
 
-    static bool HandleAscendant(ChatHandler* handler, const std::vector<std::string>& args)
+    static bool HandleAscendant(ChatHandler* handler, const std::vector<std::string>& /*args*/)
     {
         return HandleSetDifficulty(handler, std::vector<std::string>{"ascendant"});
     }
diff --git a/src/GroupScript.cpp b/src/GroupScript.cpp
index ad7ba18..f014727 100644
--- a/src/GroupScript.cpp
+++ b/src/GroupScript.cpp
@@ -19,9 +19,7 @@ class MythicPlus_GroupScript : public GroupScript
             return;
         }
 
-        MpDataStore* mpds = MpDataStore::getInstance();
-        GroupData gd = { group, MP_DIFFICULTY_NORMAL };
-        mpds->AddGroupData(group->GetGUID(), gd);
+        // sMpDataStore->AddGroupData(group->GetGUID(), gd);
     }
 
     void OnDisband(Group* group) override {
@@ -29,8 +27,8 @@ class MythicPlus_GroupScript : public GroupScript
             return;
         }
 
-        MpDataStore* mpds = MpDataStore::getInstance();
-        mpds->RemoveGroupData(group->GetGUID());
+        // MpDataStore* mpds = MpDataStore::instance();
+        // mpds->RemoveGroupData(group->GetGUID());
     }
 };
 
@@ -38,4 +36,4 @@ void Add_MP_GroupScripts()
 {
     MpLogger::debug("Add_MP_GroupScripts()");
     new MythicPlus_GroupScript();
-}
\ No newline at end of file
+}
diff --git a/src/MpDataStore.cpp b/src/MpDataStore.cpp
index a6ae757..e630170 100644
--- a/src/MpDataStore.cpp
+++ b/src/MpDataStore.cpp
@@ -24,6 +24,7 @@ void MpDataStore::AddGroupData(Group *group, int8 difficulty) {
     CharacterDatabase.Execute("REPLACE INTO group_difficulty (guid, difficulty) VALUES ({},{}) ", guid.GetCounter(), difficulty);
 }
 
+// This clears out any group data from memory and the database
 void MpDataStore::RemoveGroupData(Group *group) {
     MpLogger::debug("RemoveGroupData for group {}", group->GetGUID().GetCounter());
     groupData->erase(group->GetGUID());
diff --git a/src/MythicPlus.cpp b/src/MythicPlus.cpp
index 4796a12..fa8ed6f 100644
--- a/src/MythicPlus.cpp
+++ b/src/MythicPlus.cpp
@@ -1,16 +1,6 @@
 #include "MythicPlus.h"
 #include "MapMgr.h"
 
-MythicPlus::MythicPlus()
-{
-
-}
-
-MythicPlus::~MythicPlus()
-{
-
-}
-
 bool MythicPlus::IsMapEligible(Map* map)
 {
     if (!Enabled) {
diff --git a/src/MythicPlus.h b/src/MythicPlus.h
index a5c8f62..48abbe8 100644
--- a/src/MythicPlus.h
+++ b/src/MythicPlus.h
@@ -2,6 +2,7 @@
 #define MYTHICPLUS_H
 
 #include "Define.h"
+#include "Map.h"
 #include <map>
 #include <string>
 
diff --git a/src/MythicPlus_loader.cpp b/src/MythicPlus_loader.cpp
index cf242e6..4dabff1 100755
--- a/src/MythicPlus_loader.cpp
+++ b/src/MythicPlus_loader.cpp
@@ -13,7 +13,6 @@ void Add_MP_WorldScripts();
 
 void Addmod_mythic_plusScripts()
 {
-    LOG_DEBUG("module.MythicPlus", "[MythicPlus] Initializing scripts.");
     Add_MP_AllCreatureScripts();
     Add_MP_AllMapScripts();
     Add_MP_CommandScripts();
diff --git a/src/UnitScript.cpp b/src/UnitScript.cpp
index 7a90de9..2e62ee0 100644
--- a/src/UnitScript.cpp
+++ b/src/UnitScript.cpp
@@ -32,3 +32,7 @@ public:
     }
 
 };
+void Add_MP_UnitScripts()
+{
+    new MythicPlus_UnitScript();
+}