diff --git a/DS_Map/Main Window.cs b/DS_Map/Main Window.cs
index ee6584d..3a1d494 100644
--- a/DS_Map/Main Window.cs	
+++ b/DS_Map/Main Window.cs	
@@ -6912,6 +6912,7 @@ namespace DSPRE {
 
             if (scriptsDirty || functionsDirty || actionsDirty) {
                 DialogResult d = MessageBox.Show("There are unsaved changes in this Script File.\nDo you wish to discard them?", "Unsaved work", MessageBoxButtons.YesNo, MessageBoxIcon.Warning);
+                
                 if (!d.Equals(DialogResult.Yes)) {
                     disableHandlers = true;
                     selectScriptFileComboBox.SelectedIndex = (int)currentScriptFile.fileID;
@@ -6930,7 +6931,7 @@ namespace DSPRE {
             actionsNavListbox.Items.Clear();
 
             if (currentScriptFile.isLevelScript) {
-                ScriptTextArea.Text += "Level script files are currently not supported.\nYou can use AdAstra's Level Scripts Editor.";
+                ScriptTextArea.Text += "LevelScript files are currently not supported.\nYou can use AdAstra's Level Scripts Editor.";
                 addScriptFileButton.Visible = false;
                 removeScriptFileButton.Visible = false;
 
diff --git a/DS_Map/Resources/ScriptDatabase.cs b/DS_Map/Resources/ScriptDatabase.cs
index 4140424..03dc23d 100644
--- a/DS_Map/Resources/ScriptDatabase.cs
+++ b/DS_Map/Resources/ScriptDatabase.cs
@@ -355,7 +355,7 @@ namespace DSPRE.Resources {
             [0x00B5] = "EndChooseStarterScreen",
 
             [0x00BA] = "ChoosePlayerName",
-            [0x00BB] = "ChoosePokemonName",
+            [0x00BB] = "ChoosePokemonNickname",
             [0x00BC] = "FadeScreen",
             [0x00BD] = "WaitFadeScreen",
             [0x00BE] = "Warp",
@@ -382,7 +382,7 @@ namespace DSPRE.Resources {
             [0x00D3] = "TextMachineAttack",
             [0x00D4] = "TextMove",
             [0x00D5] = "TextNumber",
-            [0x00D6] = "TextNickname",
+            [0x00D6] = "TextPokeNickname",
             [0x00D7] = "TextPoketch",
             [0x00D8] = "TextTrainer",
             [0x00D9] = "TextPlayerTrainerType",
@@ -395,7 +395,7 @@ namespace DSPRE.Resources {
             [0x00E0] = "TextTrap",
             [0x00E1] = "TextTreasure",
             [0x00E2] = "TextMapName",
-            [0x00E3] = "GenerateSwarm",
+            [0x00E3] = "GetSwarmInfo",
             [0x00E4] = "TrainerID",
             [0x00E5] = "TrainerBattle",
             [0x00E6] = "TrainerMessage",
@@ -418,16 +418,16 @@ namespace DSPRE.Resources {
             [0x0116] = "ShowLinkCountRecord",
 
             [0x0119] = "CheckPokerus",
-            [0x011A] = "CheckPokemonGender",
+            [0x011A] = "GetPokemonGender",
             [0x011B] = "SetWarpData",
-            [0x011C] = "CheckElevatorFloor",
+            [0x011C] = "GetElevatorFloor",
             [0x011D] = "ElevatorBox",
-            [0x011E] = "SinnohDexSeen",
-            [0x011F] = "SinnohDexObtained",
-            [0x0120] = "NationalDexSeen",
-            [0x0121] = "NationalDexObtained",
+            [0x011E] = "CountSinnohDexSeen",
+            [0x011F] = "CountSinnohDexObtained",
+            [0x0120] = "CountNationalDexSeen",
+            [0x0121] = "CountNationalDexObtained",
             [0x0122] = "DummyNationalDexCheck",
-            [0x0123] = "PokedexProgressMsg",
+            [0x0123] = "GetDexProgressMsg",
             [0x0124] = "WildBattle",
             [0x0125] = "FirstBattle",
             [0x0126] = "CatchTutorial",
@@ -527,16 +527,16 @@ namespace DSPRE.Resources {
             [0x01A3] = "TakeMoneyFlex",
 
             [0x01AB] = "CompareMoneyFlex",
-            [0x01AC] = "EggHatchScreen",
+            [0x01AC] = "EggHatchScreen", //This command is dangerous when used without an egg in party
             [0x01AD] = "DummyDaycare",
             [0x01AE] = "CheckDaycareLevel",
 
             [0x01B1] = "UnvanishOverworld",
             [0x01B2] = "VanishOverworld",
-            [0x01B3] = "OpenMailScreen",
+            [0x01B3] = "MailScreen",
             [0x01B4] = "CountMail",
 
-            [0x01B6] = "CheckTimePeriod",
+            [0x01B6] = "GetTimePeriod",
             [0x01B7] = "GetRandom",
             [0x01B8] = "DummyGetRandom",
             [0x01B9] = "GetPokemonHappiness",
@@ -573,8 +573,8 @@ namespace DSPRE.Resources {
             [0x01F6] = "CountPokemonUnderLevel",
             [0x01F7] = "SurvivePoison",
 
-            [0x0200] = "GetPreviousHeader",
-            [0x0201] = "GetCurrentHeader",
+            [0x0200] = "GetPreviousHeaderID",
+            [0x0201] = "GetCurrentHeaderID",
 
             [0x0203] = "BattleRoomWarp",
             [0x0204] = "ExitBattleRoom",
@@ -1814,7 +1814,7 @@ namespace DSPRE.Resources {
             [0x00D0] = "DummyTextTrap",
             [0x00D1] = "DummyTextTreasure",
             [0x00D2] = "TextMapName",
-            [0x00D3] = "CheckSwarm",
+            [0x00D3] = "GetSwarmInfo",
             [0x00D4] = "TrainerID",
             [0x00D5] = "TrainerBattle",
             [0x00D6] = "TrainerMessage",
@@ -1831,16 +1831,16 @@ namespace DSPRE.Resources {
             [0x00E1] = "DummyTrainerFlagJump",
 
             [0x00EE] = "CheckPokerus",
-            [0x00EF] = "CheckPokemonGender",
+            [0x00EF] = "GetPokemonGender",
 
-            [0x00F1] = "CheckElevatorFloor",
+            [0x00F1] = "GetElevatorFloor",
             [0x00F2] = "ElevatorBox",
-            [0x00F3] = "GetJohtoDexSeenCount",
-            [0x00F4] = "GetJohtoDexObtained",
-            [0x00F5] = "GetNationalDexSeen",
-            [0x00F6] = "GetNationalDexObtained",
+            [0x00F3] = "CountJohtoDexSeen",
+            [0x00F4] = "CountJohtoDexObtained",
+            [0x00F5] = "CountNationalDexSeen",
+            [0x00F6] = "CountNationalDexObtained",
             [0x00F7] = "DummyNationalDexCheck",
-            [0x00F8] = "CheckDexProgressMsg",
+            [0x00F8] = "GetDexProgressMsg",
             [0x00F9] = "WildBattle",
             [0x00FA] = "WildBattleNoButtons",
             [0x00FB] = "CatchTutorial",
@@ -1917,13 +1917,13 @@ namespace DSPRE.Resources {
 
             [0x0176] = "UnvanishOverworld",
             [0x0177] = "VanishOverworld",
-            [0x0178] = "OpenMail",
-            [0x0179] = "CheckMail",
+            [0x0178] = "MailScreen",
+            [0x0179] = "CountMail",
 
             [0x017B] = "GetTimePeriod",
             [0x017C] = "GetRandom",
             [0x017D] = "DummyGetRandom",
-            [0x017E] = "CheckHappiness",
+            [0x017E] = "GetPokemonHappiness",
             [0x017F] = "AddHappiness",
             [0x0180] = "SubHappiness",
 
@@ -1976,7 +1976,7 @@ namespace DSPRE.Resources {
             [0x01E0] = "CheckRibbon",
             [0x01E1] = "GiveRibbon",
             [0x01E2] = "TextRibbon",
-            [0x01E3] = "PokemonEVCount",
+            [0x01E3] = "CountPokemonEVs",
             [0x01E4] = "GetDayOfWeek",
             [0x01E5] = "ShowRulesList",
             [0x01E6] = "DummyGetFootprint",