diff --git a/Core/AtlasLoot.lua b/Core/AtlasLoot.lua
index 6679a0f..718e791 100644
--- a/Core/AtlasLoot.lua
+++ b/Core/AtlasLoot.lua
@@ -2534,14 +2534,13 @@ AtlasLoot_HewdropDown_SubTables = {
 		{ AL["Corpsemuncher"], "KCCorpsemuncher" },
 		{ AL["Guard Captain Gort"], "KCGuardCaptainGort" },
 		{ AL["Archlich Enkhraz"], "KCArchlichEnkhraz" },
-		{ AL["Commander Anderson"], "KCCommanderAnderson" },
+		{ AL["Commander Andreon"], "KCCommanderAndreon" },
 		{ AL["Alarus"], "KCAlarus" },
 		{ AL["Half-Buried Treasure Chest"], "KCTreasure" },
 		{ AL["Trash Mobs"], "KCTrash" },
 	},
 	["CavernsOfTimeBlackMorass"] = {
 		{ AL["Chronar"], "COTBMChronar" },
-		{ AL["Harbinger Aph'ygth"], "COTBMHarbingerAphygth" },
 		{ AL["Epidamu"], "COTBMEpidamu" },
 		{ AL["Drifting Avatar of Time"], "COTBMDriftingAvatar" },
 		{ AL["Time-Lord Epochronos"], "COTBMTimeLordEpochronos" },
diff --git a/Core/ButtonRegistry.lua b/Core/ButtonRegistry.lua
index c512533..9aa9f2e 100644
--- a/Core/ButtonRegistry.lua
+++ b/Core/ButtonRegistry.lua
@@ -457,13 +457,13 @@ AtlasLoot_ButtonRegistry = {
 	};
 	["KCArchlichEnkhraz"] = {
 		Title = AL["Archlich Enkhraz"];
-		Next_Page = "KCCommanderAnderson";
-		Next_Title = AL["Commander Anderson"];
+		Next_Page = "KCCommanderAndreon";
+		Next_Title = AL["Commander Andreon"];
 		Prev_Page = "KCGuardCaptainGort";
 		Prev_Title = AL["Guard Captain Gort"];
 	};
-	["KCCommanderAnderson"] = {
-		Title = AL["Commander Anderson"];
+	["KCCommanderAndreon"] = {
+		Title = AL["Commander Andreon"];
 		Next_Page = "KCAlarus";
 		Next_Title = AL["Alarus"];
 		Prev_Page = "KCArchlichEnkhraz";
@@ -473,8 +473,8 @@ AtlasLoot_ButtonRegistry = {
 		Title = AL["Alarus"];
 		Next_Page = "KCTreasure";
 		Next_Title = AL["Half-Buried Treasure Chest"];
-		Prev_Page = "KCCommanderAnderson";
-		Prev_Title = AL["Commander Anderson"];
+		Prev_Page = "KCCommanderAndreon";
+		Prev_Title = AL["Commander Andreon"];
 	};
 	["KCTreasure"] = {
 		Title = AL["Half-Buried Treasure Chest"];
@@ -492,17 +492,10 @@ AtlasLoot_ButtonRegistry = {
 	};
 	["COTBMChronar"] = {
 		Title = AL["Chronar"];
-		Next_Page = "COTBMHarbingerAphygth";
-		Next_Title = AL["Harbinger Aph'ygth"];
-		Prev_Page = "COTTrash";
-		Prev_Title = AL["Trash Mobs"];
-	};
-	["COTBMHarbingerAphygth"] = {
-		Title = AL["Harbinger Aph'ygth"];
 		Next_Page = "COTBMEpidamu";
 		Next_Title = AL["Epidamu"];
-		Prev_Page = "COTBMChronar";
-		Prev_Title = AL["Chronar"];
+		Prev_Page = "COTTrash";
+		Prev_Title = AL["Trash Mobs"];
 	};
 	["COTBMEpidamu"] = {
 		Title = AL["Epidamu"];
diff --git a/Crafting/crafting.en.lua b/Crafting/crafting.en.lua
index 47b3bed..19127b9 100644
--- a/Crafting/crafting.en.lua
+++ b/Crafting/crafting.en.lua
@@ -249,6 +249,7 @@ AtlasLoot_Data["AtlasLootCrafting"] = {
 		{ 15049, "INV_Shoulder_18", "=q3=Blue Dragonscale Shoulders", "=ds=#s3#, #a3#" },
 		{ 15048, "INV_Chest_Chain_04", "=q3=Blue Dragonscale Breastplate", "=ds=#s5#, #a3#" },
 		{ 20295, "INV_Pants_Mail_15", "=q3=Blue Dragonscale Leggings", "=ds=#s11#, #a3#" },
+		{ 65015, "INV_Boots_Chain_06", "=q3=Blue Dragonscale Boots", "=ds=#s9#, #a3#" },
 	};
 
 	BlackDragonM = {
diff --git a/Instances/instances.en.lua b/Instances/instances.en.lua
index aa8e1cf..60955b6 100644
--- a/Instances/instances.en.lua
+++ b/Instances/instances.en.lua
@@ -636,7 +636,7 @@ AtlasLootBossButtons = {
 		"KCCorpsemuncher";
 		"KCGuardCaptainGort";
 		"KCArchlichEnkhraz";
-		"KCCommanderAnderson";
+		"KCCommanderAndreon";
 		"KCAlarus";
 		"KCTreasure";
 		"KCTrash";
@@ -2786,6 +2786,7 @@ AtlasLoot_Data["AtlasLootItems"] = {
 		{ 83221, "INV_hammer_16", "=q3=Thornroot Maul", "=ds=#h2#, #w6#", "24%" },
 		{ 83222, "INV_bracer_12", "=q3=Groveweald Elder Cuffs", "=ds=#s8#, #a1#", "24%" },
 		{ 83223, "INV_gauntlets_24", "=q3=Furbolg Battle Grips", "=ds=#s9#, #a2#", "24%" },
+		{ 0, "", "", "" },
 		{ 83224, "INV_misc_horn_03", "=q3=Horn of Engryss", "=ds=#s14#", "5%" },
 		{ 0, "", "", "" },
 		{ 60176, "INV_misc_coin_13", "=q1=Groveweald Badge", "=ds=#m3#", "100%" },
@@ -2797,6 +2798,7 @@ AtlasLoot_Data["AtlasLootItems"] = {
 		{ 83227, "inv_chest_cloth_27", "=q3=Glademender's Robes", "=ds=#s5#, #a1#", "24%" },
 		{ 83226, "INV_bracer_12", "=q3=Bands of Ranathos", "=ds=#s8#, #a2#", "24%" },
 		{ 83228, "INV_boots_03", "=q3=Treads of the Keeper", "=ds=#s12#, #a3#", "24%" },
+		{ 0, "", "", "" },
 		{ 83229, "INV_jewelry_ring_08", "=q3=Circlet of Cenarius", "=ds=#s13#", "5%" },
 		{ 0, "", "", "" },
 		{ 51217, "INV_misc_ribbon_01", "=q2=Fashion Coin", "=ds=#e27#", "1%" },
@@ -2805,6 +2807,7 @@ AtlasLoot_Data["AtlasLootItems"] = {
 		{ 83208, "INV_belt_22", "=q3=Circlet of the Crescent Moon", "=ds=#s1#, #a1#", "30%" },
 		{ 83209, "INV_axe_12", "=q3=Sentinel's Moonslicer", "=ds=#h2#, #w1#", "30%" },
 		{ 83211, "INV_shoulder_05", "=q3=Moontouched Shoulders", "=ds=#s3#, #a2#", "30%" },
+		{ 0, "", "", "" },
 		{ 83210, "inv_weapon_shortblade_23", "=q3=Crescent Sigil", "=ds=#s14#", "10%" },
 		{ 0, "", "", "" },
 		{ 51217, "INV_misc_ribbon_01", "=q2=Fashion Coin", "=ds=#e27#", "1%" },
@@ -2847,7 +2850,6 @@ AtlasLoot_Data["AtlasLootItems"] = {
 	GCPackmasterRagetooth = {
 		{ 61301, "INV_Boots_05", "=q2=Shaderun Boots", "=ds=#s12#, #a1#", "33%" },
 		{ 61300, "INV_Gauntlets_21", "=q2=Packmaster Gloves", "=ds=#s9#, #a2#", "33%" },
-		{ 0, "", "", "" },
 		{ 61302, "INV_Jewelry_Necklace_13", "=q2=Wolfheart Necklace", "=ds=#s2#", "33%" },
 		{ 0, "", "", "" },
 		{ 61303, "INV_Misc_Orb_04", "=q3=Orb of Aka'thar", "=ds=#s15#", "2%" },
@@ -2856,28 +2858,27 @@ AtlasLoot_Data["AtlasLootItems"] = {
 		{ 61309, "inv_shoulder_24", "=q3=Mantle of Law", "=ds=#s3#, #a1#", "25%" },
 		{ 61311, "INV_Bracer_07", "=q3=Sutherland's Cuffs", "=ds=#s8#, #a1#", "25%" },
 		{ 61310, "INV_Belt_15", "=q3=Sash of Conviction", "=ds=#s10#, #a1#", "25%" },
-		{ 61312, "INV_Jewelry_Necklace_17", "=q3=The Black Pendant", "=ds=#s2#", "2%" },
-		{ 0, "", "", "" },
 		{ 61308, "INV_Hammer_05", "=q3=Gavel of Gilnean Justice", "=ds=#h3#, #w6#", "25%" },
+		{ 0, "", "", "" },
+		{ 61312, "INV_Jewelry_Necklace_17", "=q3=The Black Pendant", "=ds=#s2#", "2%" },
 	};
 	GCDustivanBlackcowl = {		
 		{ 61331, "INV_Belt_17", "=q3=Blackcowl Sash", "=ds=#s10#, #a2#", "25%" },
 		{ 61332, "INV_Jewelry_Ring_35", "=q3=Ring of Electrical Binding", "=ds=#s13#", "25%" },
-		{ 61334, "INV_Misc_Cape_19", "=q3=Cloak of the Dark Veil", "=ds=#s4#", "5%" },
-		{ 0, "", "", "" },
 		{ 61330, "INV_Knife_1H_Draenei_A_03", "=q3=Dagger of Sinister Secrets", "=ds=#h1#, #w4#", "25%" },
 		{ 61333, "INV_Sword_36", "=q3=Hookblade Cleaver", "=ds=#h1#, #w10#", "25%" },
 		{ 0, "", "", "" },
+		{ 61334, "INV_Misc_Cape_19", "=q3=Cloak of the Dark Veil", "=ds=#s4#", "5%" },
+		{ 0, "", "", "" },
 		{ 61626, "INV_Scroll_03", "=q1=Ebonmere Deed", "=ds=#m3#", "100%" },
 	};
 	GCMarshalMagnusGreystone = {
 		{ 61313, "inv_helmet_02", "=q3=Greymane Helmet", "=ds=#s1#, #a4#", "25%" },
-		{ 0, "", "", "" },
 		{ 61315, "INV_Jewelry_Ring_27", "=q3=Band of Piercing Shadows", "=ds=#s13#", "25%" },
-		{ 61317, "INV_Misc_Book_10", "=q3=Scriptures of Blood", "=ds=#s14#", "5%" },
+		{ 61314, "INV_Shield_06", "=q3=Marshal's Blocker", "=ds=#w8#", "25%" },
 		{ 61316, "INV_Misc_Cape_02", "=q3=Chainlinked Cloak", "=ds=#s4#", "25%" },
 		{ 0, "", "", "" },
-		{ 61314, "INV_Shield_06", "=q3=Marshal's Blocker", "=ds=#w8#", "25%" },
+		{ 61317, "INV_Misc_Book_10", "=q3=Scriptures of Blood", "=ds=#s14#", "5%" },
 		{ 0, "", "", "" },
 		{ 61368, "INV_Shirt_GuildTabard_01", "=q2=Greymane Tabard", "=ds=#s7#", "3%" },
 	};
@@ -2888,7 +2889,6 @@ AtlasLoot_Data["AtlasLootItems"] = {
 	GCHorsemasterLevvin = {
 		{ 61734, "INV_Belt_09", "=q2=Horsemaster Belt", "=ds=#s10#, #a2#", "25%" },
 		{ 61736, "INV_Misc_Pelt_Bear_Ruin_03", "=q2=Horse Rustler Drape", "=ds=#s4#", "25%" },
-		{ 0, "", "", "" },
 		{ 61735, "INV_Staff_08", "=q2=Stablehand Broom", "=ds=#h2#, #w9#", "25%" },
 		{ 61737, "INV_Misc_Lantern_01", "=q3=Stablemaster's Nightlight", "=ds=#s15#", "25%" },
 		{ 0, "", "", "" },
@@ -2898,7 +2898,6 @@ AtlasLoot_Data["AtlasLootItems"] = {
 		{ 61319, "INV_Chest_Cloth_04", "=q3=Regal Robes of the Regent", "=ds=#s5#, #a1#", "25%" },
 		{ 61321, "INV_Bracer_13", "=q3=Wildfeather Bracers", "=ds=#s8#, #a2#", "25%" },
 		{ 61320, "inv_misc_desecrated_mailpants", "=q3=Ashen Leggings", "=ds=#s11#, #a3#", "25%" },
-		{ 0, "", "", "" },
 		{ 61318, "INV_ThrowingAxe_06", "=q3=Fleshslasher", "=ds=#h2#, #w1#", "25%" },
 		{ 0, "", "", "" },
 		{ 61322, "INV_Jewelry_Necklace_16", "=q3=Resurging Necklace", "=ds=#s2#", "5%" },
@@ -2909,7 +2908,6 @@ AtlasLoot_Data["AtlasLootItems"] = {
 		{ 61327, "INV_Boots_07", "=q3=Boots of Espionage", "=ds=#s12#, #a2#", "15%" },
 		{ 61325, "inv_chest_plate04", "=q3=Regal Goldforged Breastplate", "=ds=#s5#, #a3#", "15%" },
 		{ 61324, "inv_shoulder_12", "=q3=Greymane Shoulders", "=ds=#s3#, #a4#", "15%" },
-		{ 0, "", "", "" },
 		{ 61328, "INV_Sword_17", "=q3=Wolfblood", "=ds=#h2#, #w10#", "15%" },
 		{ 61329, "inv_misc_bag_10_red", "=q3=Sack of Gruesome Eminence", "=ds=#s15#", "15%" },
 		{ 0, "", "", "" },
@@ -2986,7 +2984,7 @@ AtlasLoot_Data["AtlasLootItems"] = {
 		{ 0, "", "", "", "" },
 		{ 51217, "INV_misc_ribbon_01", "=q2=Fashion Coin", "=ds=#e27#", "5%" },
 	};
-	KCCommanderAnderson = {
+	KCCommanderAndreon = {
 		{ 50188, "INV_Belt_03", "=q3=Deathforge Belt", "=ds=#s10#, #a4#", "16% ?" },
 		{ 50189, "INV_Belt_27", "=q3=Ring of Authority", "=ds=#s13#", "16% ?" },
 		{ 50190, "INV_Boots_05", "=q3=Boots of the Holy Mentor", "=ds=#s12#, #a1#", "16% ?" },
@@ -3001,6 +2999,7 @@ AtlasLoot_Data["AtlasLootItems"] = {
 		{ 83466, "INV_pants_plate_20", "=q3=Baneforged Leggings", "=ds=#s11#, #a4#", "25%" },
 		{ 83467, "INV_wand_03", "=q3=Cryptwatcher's Call", "=ds=#w12#", "25%" },
 		{ 83468, "INV_jewelry_ring_09", "=q3=Corpsekeeper's Charge", "=ds=#s13#", "25%" },
+		{ 0, "", "", "" },
 		{ 83469, "INV_crown_01", "=q3=Cryptstone Circlet", "=ds=#s1#, #a1#", "21%" },
 		{ 83470, "INV_pants_03", "=q3=Wraithscale Leggings", "=ds=#s11#, #a3#", "21%" },
 		{ 83471, "INV_staff_08", "=q3=Staff of Alarus", "=ds=#h2#, #w9#", "21%" },
@@ -3008,7 +3007,7 @@ AtlasLoot_Data["AtlasLootItems"] = {
 		{ 0, "", "", "" },
 		{ 83464, "INV_shoulder_11", "=q4=Mantle of Twisted Damnation", "=ds=#s3#, #a1#", "1%" },
 		{ 0, "", "", "" },
-		{ 83571, "inv_misc_book_05", "=q3=Codex: Shadow Mend", "=ds=#c5#", "15" },
+		{ 83571, "inv_misc_book_05", "=q3=Codex: Shadow Mend", "=ds=#c5#", "15%" },
 		{ 0, "", "", "", "" },
 		{ 51217, "INV_misc_ribbon_01", "=q2=Fashion Coin", "=ds=#e27#, Quantity of 2", "100%" },
 	};
@@ -3081,7 +3080,7 @@ AtlasLoot_Data["AtlasLootItems"] = {
 		{ 61045, "INV_Shoulder_07", "=q3=Nexus Shoulderpads", "=ds=#s3#, #a2#", "13%" },
 		{ 61055, "INV_Misc_Book_01", "=q3=Tome of Riftmancy", "=ds=#s15#", "13%" },
 		{ 61056, "INV_Boots_07", "=q3=Arcanoweave Boots", "=ds=#s12#, #a1#", "13%" },
-		{ 61700, "inv_fabric_celestial_cloth", "=q3=Fabric of Time", "=ds=#s14#" },
+		{ 61700, "inv_fabric_celestial_cloth", "=q3=Fabric of Time", "=ds=#s14#", "13%" },
 		{ 61698, "INV_QirajIdol_Life", "=q3=Totem of the Calming River", "=ds=#s16#, #e17# =q15=#c7#", "13%" },
 	};
 	COTBMDriftingAvatar = {
@@ -3094,6 +3093,7 @@ AtlasLoot_Data["AtlasLootItems"] = {
 		{ 61042, "INV_Gauntlets_11", "=q3=Stormfist", "=ds=#h1#, #w13#", "14%" },
 		{ 61044, "INV_Hammer_04", "=q3=Gavel of the Northwind", "=ds=#h2#, #w6#", "14%" },
 		{ 61057, "INV_Gauntlets_24", "=q3=Arcanic Gloves", "=ds=#s9#, #a2#", "14%" },
+		{ 0, "", "", "" },
 		{ 61020, "INV_Wand_02", "=q4=Lodestone", "=ds=#w12#", "2%" },
 	};
 	COTBMTimeLordEpochronos = {
@@ -3106,7 +3106,7 @@ AtlasLoot_Data["AtlasLootItems"] = {
 		{ 61028, "INV_shield_03", "=q3=Bulwark of the Crimson Guard", "=ds=#h4#, #w8#", "12%" },
 		{ 61054, "INV_pants_03", "=q3=Azurite Legguards", "=ds=#s11#, #a3#", "12%" },
 		{ 61058, "INV_pants_04", "=q3=Leggings of the Nullifier", "=ds=#s11#, #a4#", "12%" },
-		{ 61022, "INV_Weapon_Shortblade_38", "=q3=Dagger of the Currents", "=ds=#h4#, #w4#", "12%" },
+		{ 61022, "INV_Weapon_Shortblade_38", "=q3=Dagger of the Currents", "=ds=#h3#, #w4#", "12%" },
 		{ 0, "", "", "" },
 		{ 61049, "INV_sword_19", "=q4=Chronobreaker", "=ds=#h2#, #w10#", "0.95%" },
 	};	
@@ -3137,16 +3137,17 @@ AtlasLoot_Data["AtlasLootItems"] = {
 		{ 0, "", "", "" },
 		{ 50427, "INV_chest_leather_08", "=q3=Time-blackened Chestpiece", "=ds=#s5#, #a2#", "50%" },
 		{ 61053, "INV_helmet_24", "=q3=Timeloop Headguard", "=ds=#s1#, #a3#", "50%" },
+		{ 0, "", "", "" },
 		{ 61046, "INV_axe_08", "=q3=Shadowreaper", "=ds=#h1#, #w1#", "33%" },
-		{ 61031, "INV_staff_07", "=q3=Riftweaver", "=ds=#h2#, #w9#", "33%" },
 		{ 50429, "INV_spear_07", "=q3=Spear of the Endless Hunt", "=ds=#h2#, #w7#", "33%" },
 		{ 61037, "INV_chest_plate09", "=q3=Breastplate of the Lost Champion", "=ds=#s5#, #a4#", "33%" },
+		{ 0, "", "", "" },
+		{ 61031, "INV_staff_07", "=q3=Riftweaver", "=ds=#h2#, #w9#", "33%" },
 		{ 61027, "INV_shoulder_24", "=q3=Epaulets of the Forgotten Past", "=ds=#s3#, #a1#", "33%" },
 		{ 61040, "INV_gauntlets_05", "=q3=Gloves of the Unknown", "=ds=#s9#, #a1#", "33%" },
 		{ 0, "", "", "" },
 		{ 61014, "INV_Enchant_ShardBrilliantLarge", "Shard of Eternity", "=ds=#s14#", "1%" },
 		{ 61043, "Spell_Shadow_SoulGem", "=q4=Eye of the Abyss", "=ds=#s2#", "1.1%" },
-		{ 0, "", "", "" },
 		{ 51044, "INV_misc_head_dragon_black", "=q1=Antnormi's Head", "=ds=#m3#", "100%" },
 		{ 0, "", "", "", "" },
 		{ 51217, "INV_misc_ribbon_01", "=q2=Fashion Coin", "=ds=#e27#, Quantity of 2", "100%" },
@@ -3185,7 +3186,7 @@ AtlasLoot_Data["AtlasLootItems"] = {
 		{ 60419, "INV_helmet_15", "=q3=Necrolyte's Visage", "=ds=#s1#, #a1#", "17%" },
 		{ 60425, "INV_chest_cloth_48", "=q3=Shadowguard Robe", "=ds=#s5#, #a1#", "17%" },
 		{ 60431, "INV_misc_book_06", "=q3=Almanac of Savagery", "=ds=#h4#", "17%" },
-		{ 60434, "INV_gauntlets_17", "=q3=Greaves of the Elite Guard", "=ds=#s11#, #a4#", "17%" },
+		{ 60434, "INV_pants_04", "=q3=Greaves of the Elite Guard", "=ds=#s11#, #a4#", "17%" },
 		{ 0, "", "", "" },
 		{ 51217, "INV_misc_ribbon_01", "=q2=Fashion Coin", "=ds=#e27#", "5%" },
 	};
@@ -3234,11 +3235,12 @@ AtlasLoot_Data["AtlasLootItems"] = {
 		{ 40003, "INV_shield_06", "=q3=Vault's Defender", "=ds=#h4#, #w8#", "25%" },
 		{ 60505, "INV_jewelry_ring_27", "=q3=Ring of the Elder Warden", "=ds=#s13#", "25%" },
 		{ 60506, "INV_weapon_crossbow_05", "=q3=Vigilance", "=ds=#w3#", "25%" },
+		{ 60501, "INV_Misc_Crop_01", "=q3=Whip of Encouragement", "=ds=#s14#", "25%" },
+		{ 0, "", "", "" },
 		{ 60420, "INV_jewelry_necklace_16", "=q3=Amulet of Warding", "=ds=#s2#", "25%" },
 		{ 60426, "INV_Chest_Plate08", "=q3=Guard-Captain's Chestplate", "=ds=#s5#, #a4#", "25%" },
 		{ 60429, "INV_bracer_19", "=q3=Arcanite Shackles", "=ds=#s8#, #a4#", "25%" },
 		{ 60430, "INV_boots_05", "=q3=Runewarder's Boots", "=ds=#s12#, #a1#", "25%" },
-		{ 60501, "INV_Misc_Crop_01", "=q3=Whip of Encouragement", "=ds=#s14#", "25%" },
 		{ 0, "", "", "" },
 		{ 83570, "inv_scroll_02", "=q3=Technique: Die by the Sword", "=ds=#c9#", "15%" },
 		{ 0, "", "", "" },
diff --git a/Locale/locale.en.lua b/Locale/locale.en.lua
index c7ed299..09ba196 100644
--- a/Locale/locale.en.lua
+++ b/Locale/locale.en.lua
@@ -923,12 +923,11 @@ AL:RegisterTranslations("enUS", function() return {
 	["Corpsemuncher"] = true,
 	["Guard Captain Gort"] = true,
 	["Archlich Enkhraz"] = true,
-	["Commander Anderson"] = true,
+	["Commander Andreon"] = true,
 	["Alarus"] = true,
 	["Half-Buried Treasure Chest"] = true,
 	["Caverns of Time: Black Morass"] = "|cffffffff[60]|cffffd200 Caverns of Time: Black Morass",
 	["Chronar"] = true,
-	["Harbinger Aph'ygth"] = true,	
 	["Epidamu"] = true,
 	["Drifting Avatar of Time"] = true,
 	["Time-Lord Epochronos"] = true,
diff --git a/TableRegister/loottables.en.lua b/TableRegister/loottables.en.lua
index c06c08d..083d9c5 100644
--- a/TableRegister/loottables.en.lua
+++ b/TableRegister/loottables.en.lua
@@ -374,13 +374,12 @@ AtlasLoot_TableNames = {
 	["KCCorpsemuncher"] = { AL["Corpsemuncher"], "AtlasLootItems" },
 	["KCGuardCaptainGort"] = { AL["Guard Captain Gort"], "AtlasLootItems" },
 	["KCArchlichEnkhraz"] = { AL["Archlich Enkhraz"], "AtlasLootItems" },
-	["KCCommanderAnderson"] = { AL["Commander Anderson"], "AtlasLootItems" },
+	["KCCommanderAndreon"] = { AL["Commander Andreon"], "AtlasLootItems" },
 	["KCAlarus"] = { AL["Alarus"], "AtlasLootItems" },
 	["KCTreasure"] = { AL["Half-Buried Treasure Chest"], "AtlasLootItems" },
 	["KCTrash"] = { AL["Trash Mobs"], "AtlasLootItems" },
 	-- Caverns of Time: Black Morass
 	["COTBMChronar"] = { AL["Chronar"], "AtlasLootItems" },
-	["COTBMHarbingerAphygth"] = { AL["Harbinger Aph'ygth"], "AtlasLootItems" },
 	["COTBMEpidamu"] = { AL["Epidamu"], "AtlasLootItems" },
 	["COTBMDriftingAvatar"] = { AL["Drifting Avatar of Time"], "AtlasLootItems" },
 	["COTBMTimeLordEpochronos"] = { AL["Time-Lord Epochronos"], "AtlasLootItems" },
@@ -1121,14 +1120,13 @@ AtlasLoot_TableNamesBoss = {
 		["KCCorpsemuncher"] = { AL["Corpsemuncher"], "AtlasLootItems" },
 		["KCGuardCaptainGort"] = { AL["Guard Captain Gort"], "AtlasLootItems" },
 		["KCArchlichEnkhraz"] = { AL["Archlich Enkhraz"], "AtlasLootItems" },
-		["KCCommanderAnderson"] = { AL["Commander Anderson"], "AtlasLootItems" },
+		["KCCommanderAndreon"] = { AL["Commander Andreon"], "AtlasLootItems" },
 		["KCAlarus"] = { AL["Alarus"], "AtlasLootItems" },
 		["KCTreasure"] = { AL["Half-Buried Treasure Chest"], "AtlasLootItems" },
 		["KCTrash"] = { AL["Trash Mobs"], "AtlasLootItems" },
 	},
 	["Caverns of Time: Black Morass"] = {
 		["COTBMChronar"] = { AL["Chronar"], "AtlasLootItems" },
-		["COTBMHarbingerAphygth"] = { AL["Harbinger Aph'ygth"], "AtlasLootItems" },
 		["COTBMEpidamu"] = { AL["Epidamu"], "AtlasLootItems" },
 		["COTBMDriftingAvatar"] = { AL["Drifting Avatar of Time"], "AtlasLootItems" },
 		["COTBMTimeLordEpochronos"] = { AL["Time-Lord Epochronos"], "AtlasLootItems" },
diff --git a/WorldBosses/worldbosses.en.lua b/WorldBosses/worldbosses.en.lua
index 7c78848..179b662 100644
--- a/WorldBosses/worldbosses.en.lua
+++ b/WorldBosses/worldbosses.en.lua
@@ -106,6 +106,7 @@ AtlasLoot_Data["AtlasLootWBItems"] = {
 		{ 51789, "inv_helmet_13", "=q4=Circlet of Forlorn Spirits", "=ds=#s1#, #a1#", "4%" },
 		{ 51781, "inv_shoulder_02", "=q4=Necrotic Wake Mantle",  "=ds=#s3#, #a1#", "4%" },
 		{ 51784, "inv_belt_22", "=q4=Belt of Archaic Power", "=ds=#s10#, #a1#", "4%" },
+		{ 0, "", "", "", "" },
 		{ 51788, "inv_helmet_30", "=q4=Visage of the Forgotten", "=ds=#s1#, #a2#", "4%" },
 		{ 51787, "inv_shoulder_05", "=q4=Spaulders of Insight", "=ds=#s3#, #a2#", "4%" },
 		{ 51783, "inv_bracer_07", "=q4=Shadowskin Bracers", "=ds=#s8#, #a2#", "4%" },
@@ -126,9 +127,7 @@ AtlasLoot_Data["AtlasLootWBItems"] = {
 		{ 51738, "inv_chest_leather_05", "=q4=Tunnel Field Carapace", "=ds=#s5#, #a2#", "20%" },
 		{ 51737, "inv_chest_cloth_02", "=q4=Vestments of Eternal Autumn", "=ds=#s5#, #a2#", "20%" },
 		{ 51736, "inv_chest_cloth_39", "=q4=Plauge-Infected Robe", "=ds=#s5#, #a1#", "20%" },
-		{ 0, "", "", "", "" },
 		{ 51735, "inv_wand_01", "=q4=Scourgelord's Fang", "=ds=#w12#", "20%" },
-		{ 0, "", "", "", "" },
 		{ 51740, "inv_helmet_06", "=q4=Crown of Skittering Shadows", "=ds=#s1#, #a1#", "20%" },
 		{ 0, "", "", "", "" },
 		{ 51734, "inv_misc_cape_21", "=q4=Shawl of Haunted Memories", "=ds=#s4#", "20%" },
@@ -138,6 +137,8 @@ AtlasLoot_Data["AtlasLootWBItems"] = {
 		{ 51730, "inv_misc_cape_18", "=q4=Shawl of Nerubian Silk", "=ds=#s4#", "20%" },
 		{ 0, "", "", "", "" },
 		{ 0, "", "", "", "" },
+		{ 0, "", "", "", "" },
+		{ 0, "", "", "", "" },
 		{ 12717, "inv_scroll_05", "=q4=Plans: Lionheart Helm", "=ds=#sr# =so1=300 =so2=320 =so3=330 =so4=340", "5%" },
 		{ 12640, "inv_helmet_36", "=q4=Lionheart Helm", "=ds=#s1#, #a4#" },
 		{ 0, "", "", "", "" },
@@ -183,29 +184,20 @@ AtlasLoot_Data["AtlasLootWBItems"] = {
 		{ 83480, "inv_misc_book_07", "=q4=Tome of Infalliable Truth", "=ds=#h4#, #s15#", "17%" },
 		{ 83481, "inv_mace_08", "=q4=Failsafe Activation Key", "=ds=#h4#, #s15#", "17%" },
 		{ 83482, "inv_wand_06", "=q4=Distress Signal Pulser", "=ds=#h4#, #s15#", "17%" },
-		{ 0,"","","" },
-		{ 83530, "inv_helmet_63", "=q4=Turban of Veiled Mists", "=ds=#s1#, #a1#", "17%" },
-		{ 0,"","","" },
-		{ 83531, "inv_belt_17", "=q4=Clutch of Mending Winds", "=ds=#s10#, #a2#", "17%" },
+		{ 83483, "inv_helmet_03", "=q4=Crown of Divine Justice", "=ds=#s1#, #a4#", "17%" },
+		{ 83484, "inv_jewelry_necklace_14", "=q4=Desert Wind Talisman", "=ds=#s2#", "17%" },
 		{ 83532, "inv_bracer_07", "=q4=Bracers of the Crescent Moon", "=ds=#s8#, #a2#", "17%" },
 		{ 0,"","","" },
-		{ 0,"","","" },
+		{ 83530, "inv_helmet_63", "=q4=Turban of Veiled Mists", "=ds=#s1#, #a1#", "17%" },
+		{ 83531, "inv_belt_17", "=q4=Clutch of Mending Winds", "=ds=#s10#, #a2#", "17%" },
 		{ 83487, "inv_sword_01", "=q4=Blade of the Fallen Star", "=ds=#h3#, #w10#", "17%" },
-		{ 0,"","","" },
-		{ 0,"","","" },
-		{ 0,"","","" },
-		{ 0,"","","" },
-		{ 83484, "inv_jewelry_necklace_14", "=q4=Desert Wind Talisman", "=ds=#s2#", "17%" },
 		{ 83486, "inv_misc_cape_07", "=q4=Sandstalker's Shroud", "=ds=#s4#", "17%" },
-		{ 0,"","","" },
-		{ 0,"","","" },
 		{ 83488, "inv_boots_chain_02", "=q4=Uldum Construct Stompers", "=ds=#s12#, #a3#", "17%" },
-		{ 0,"","","" },
-		{ 83483, "inv_helmet_03", "=q4=Crown of Divine Justice", "=ds=#s1#, #a4#", "17%" },
 		{ 83485, "inv_gauntlets_16", "=q4=Fists of the Makers", "=ds=#s9#, #a4#", "17%" },
 		{ 0,"","","" },
 		{ 0,"","","" },
 		{ 83235, "inv_misc_pocketwatch_03", "=q4=Ancient Locking Mechanism", "", "100%" },
+		{ 0,"","","" },
 		{ 17962, "INV_Misc_Bag_10_Blue","=q2=Blue Sack of Gems","=ds=#m23# =q2=#e33#", "100%" },
 	};
 	Concavius = {
@@ -257,16 +249,20 @@ AtlasLoot_Data["AtlasLootWBItems"] = {
 	};
 	KKazzak = {
 		{ 18546, "INV_Helmet_18", "=q4=Infernal Headcage", "=ds=#s1#, #a3#", "20%" },
-		{ 17111, "INV_Jewelry_Talisman_01", "=q4=Blazefury Medallion", "=ds=#s2#", "20%" },
+		{ 17112, "INV_Hammer_05", "=q4=Empyrean Demolisher", "=ds=#h3#, #w6#", "20%" },
 		{ 18204, "INV_Misc_Cape_07", "=q4=Eskhandar's Pelt", "=ds=#s4#", "20%" },
+		{ 18543, "INV_Jewelry_Ring_20", "=q4=Ring of Entropy", "=ds=#s13#", "20%" },
+		{ 19133, "INV_Pants_06", "=q4=Fel Infused Leggings", "=ds=#s11#, #a1#", "20%" },
+		{ 0, "", "", "", "" },
+		{ 17111, "INV_Jewelry_Talisman_01", "=q4=Blazefury Medallion", "=ds=#s2#", "20%" },
 		{ 19135, "INV_Bracer_07", "=q4=Blacklight Bracer", "=ds=#s8#, #a1#", "20%" },
 		{ 18544, "INV_Gauntlets_22", "=q4=Doomhide Gauntlets", "=ds=#s9#, #a2#", "20%" },
 		{ 19134, "INV_Belt_16", "=q4=Flayed Doomguard Belt", "=ds=#s10#, #a2#", "20%" },
-		{ 19133, "INV_Pants_06", "=q4=Fel Infused Leggings", "=ds=#s11#, #a1#", "20%" },
-		{ 18543, "INV_Jewelry_Ring_20", "=q4=Ring of Entropy", "=ds=#s13#", "20%" },
-		{ 17112, "INV_Hammer_05", "=q4=Empyrean Demolisher", "=ds=#h3#, #w6#", "20%" },
 		{ 17113, "INV_Staff_Goldfeathered_01", "=q4=Amberseal Keeper", "=ds=#w9#", "20%" },
 		{ 0, "", "", "", "" },
+		{ 0, "", "", "", "" },
+		{ 0, "", "", "", "" },
+		{ 0, "", "", "", "" },
 		{ 18665, "Spell_Shadow_UnholyFrenzy", "=q4=The Eye of Shadow", "=ds=#s14#", "100%" },
 		{ 18608, "INV_Staff_30", "=q4=Benediction", "=q1=#m4# =ds=#w9# =q9=#c5#" },
 		{ 18609, "INV_Staff_12", "=q4=Anathema", "=q1=#m4# =ds=#w9# =q9=#c5#" },
@@ -420,6 +416,10 @@ AtlasLoot_Data["AtlasLootWBItems"] = {
 		{ 18202, "INV_Misc_MonsterClaw_04", "=q4=Eskhandar's Left Claw", "=ds=#h4#, #w13#", "10%" },
 		{ 18542, "INV_Sword_41", "=q4=Typhoon", "=ds=#h2#, #w10#", "10%" },
 		{ 0, "", "", "", "" },
+		{ 0, "", "", "", "" },
+		{ 0, "", "", "", "" },
+		{ 0, "", "", "", "" },
+		{ 0, "", "", "", "" },
 		{ 18704, "INV_Misc_Bandage_04", "=q4=Mature Blue Dragon Sinew", "=ds=#m3#", "100%" },
 		{ 18714, "INV_Misc_Quiver_03", "=q4=Ancient Sinew Wrapped Lamina", "=q1=#m4# =ds=#m12# #e9# =q14=#c2#" },
 		{ 0, "", "", "", "" },
@@ -442,6 +442,7 @@ AtlasLoot_Data["AtlasLootWBItems"] = {
 		{ 81366, "INV_MISC_DESECRATED_PLATESHOULDER", "=q3=Blackrock Clan Mantle", "=ds=#a4#, #s3#", "25%" },
 		{ 81367, "INV_Jewelry_Ring_23", "=q3=Band of the Old Horde", "=ds=#s13#", "25%" },
 		{ 81368, "INV_Bracer_07", "=q3=Blackshackle Bracers", "=ds=#a3#, #s8#", "25%" },
+		{ 0, "", "", "", "" },
 		{ 81369, "INV_Sword_20", "=q4=Sword of the Blademaster", "=ds=#w10#", "0.5%" },
 	};
 	Xalvic = {
@@ -449,6 +450,7 @@ AtlasLoot_Data["AtlasLootWBItems"] = {
 		{ 81371, "INV_Chest_Leather_06", "=q3=Gnarltwist Vest", "=ds=#a3#", "25%" },
 		{ 81372, "INV_Misc_MonsterClaw_01", "=q3=The Black Claw", "=ds=#w13#", "25%" },
 		{ 81373, "INV_Misc_Cape_06", "=q3=Shawl of the Satyr", "=ds=#a1#", "25%" },
+		{ 0, "", "", "", "" },
 		{ 81374, "INV_Jewelry_Necklace_13", "=q4=Trickster's Necklace", "=ds=#s2#", "0.5%" },
 	};
 	Mallon = {
@@ -456,6 +458,7 @@ AtlasLoot_Data["AtlasLootWBItems"] = {
 		{ 81376, "INV_Belt_12", "=q3=Moontouched Girdle", "=ds=#a4#", "25%" },
 		{ 81377, "INV_Helmet_06", "=q3=Enfused Moon Crown", "=ds=#a1#", "25%" },
 		{ 81378, "INV_Gauntlets_04", "=q3=Eveningstar Gloves", "=ds=#a2#", "25%" },
+		{ 0, "", "", "", "" },
 		{ 81379, "INV_Jewelry_Ring_29", "=q4=Shard of the Moon", "=ds=#s13#", "0.5%" },
 	};
 	Grugthok = {
@@ -463,6 +466,7 @@ AtlasLoot_Data["AtlasLootWBItems"] = {
 		{ 81381, "INV_Staff_07", "=q3=Isildien Ley-Stave", "=ds=#s15#", "25%" },
 		{ 81382, "INV_Jewelry_Necklace_19", "=q3=Gordunni War Beads", "=ds=#s2#", "25%" },
 		{ 81383, "INV_Mace_11", "=q3=The Ogre Truncheon", "=ds=#w6#", "25%" },
+		{ 0, "", "", "", "" },
 		{ 81384, "INV_Belt_12", "=q4=Grug'thok's Sash", "=ds=#a2#", "0.5%" },
 	};
 	WanderingKnight = {
@@ -472,17 +476,19 @@ AtlasLoot_Data["AtlasLootWBItems"] = {
 		{ 83260, "INV_Chest_Chain_09", "=q3=Footman's Breastplate", "=ds=#a3#", "25%" },
 	};
 	CrusaderLarsarius = {
-		{ 60437, "INV_Helmet_03", "=q4=Righteous Crusader's Helmet", "=ds=#a4#", "0.2%" },
 		{ 83261, "INV_Misc_Book_09", "=q3=Tome of the First Scripture", "=ds=#s15#", "25%" },
 		{ 83262, "INV_Hammer_17", "=q3=Scarlet Wanderer's Hammer", "=ds=#w6#", "25%" },
 		{ 83263, "INV_Bracer_10", "=q3=Cuffs of the Justicar", "=ds=#a2#", "25%" },
 		{ 83264, "INV_Jewelry_Ring_23", "=q3=Ring of Sacrifice", "=ds=#s13#", "25%" },
+		{ 0, "", "", "", "" },
+		{ 60437, "INV_Helmet_03", "=q4=Righteous Crusader's Helmet", "=ds=#a4#", "0.2%" },
 	};
 	Zareth = {
 		{ 83265, "INV_Misc_Bandana_03", "=q3=Demon Hunter's Blindfold", "=ds=#a2#", "25%" },
 		{ 83266, "INV_Boots_Fabric_01", "=q3=Sandals of the Demon Stalker", "=ds=#a1#", "25%" },
 		{ 83267, "INV_Bracer_02", "=q3=Bracers of Demonic Hunt", "=ds=#a3#", "25%" },
 		{ 83268, "INV_Jewelry_Ring_48Naxxramas", "=q3=Demon Watcher's Ring", "=ds=#s13#", "25%" },
+		{ 0, "", "", "", "" },
 		{ 83269, "INV_Spear_08", "=q4=Terrorblade Glaive", "=ds=#w10#", "0.5%" },
 	};
 	Jalakar = {
@@ -490,14 +496,16 @@ AtlasLoot_Data["AtlasLootWBItems"] = {
 		{ 51024, "INV_Misc_Idol_02", "=q3=Cursed Idol", "=ds=#s14#", "25%" },
 		{ 51025, "Ability_Ambush", "=q3=Vilebranch Seer's Dress", "=ds=#a1#", "25%" },
 		{ 83273, "INV_Belt_06", "=q3=The Dire Clasp", "=ds=#a3#", "25%" },
+		{ 0, "", "", "", "" },
 		{ 83274, "INV_Jewelry_Necklace_19", "=q4=Charmed Voodoo Collar", "=ds=#s2#", "0.5%" },
 	};
 	Ashbeard = {
-		{ 83275, "INV_Misc_Spyglass_02", "=q4=Ashbeard's Lucky Telescope", "=ds=#s14#", "0.5%" },
 		{ 83276, "INV_Helmet_44", "=q3=Lens of the Gorge Explorer", "=ds=#a1#", "25%" },
 		{ 83277, "INV_Misc_Cape_02", "=q3=Dark Iron Adventurer Shawl", "=ds=#a1#", "25%" },
 		{ 83278, "INV_Shoulder_22", "=q3=Ash Explorer Pauldrons", "=ds=#a2#", "25%" },
 		{ 83279, "Spell_Fire_Fire", "=q3=Everflame Torch", "=ds=#w6#", "25%" },
+		{ 0, "", "", "", "" },
+		{ 83275, "INV_Misc_Spyglass_02", "=q4=Ashbeard's Lucky Telescope", "=ds=#s14#", "0.5%" },
 	};
 	AdmiralBareanWestwind = {
 		{ 60383, "inv_staff_08", "=q3=Fleetmaster's Cane", "=ds=#w9#", "17%" },
@@ -506,6 +514,7 @@ AtlasLoot_Data["AtlasLootWBItems"] = {
 		{ 60386, "inv_belt_04", "=q3=Sash of the Northrend Expedition", "=ds=#a1#, #s10#", "17%" },
 		{ 60387, "inv_ore_arcanite_02", "=q3=Sivaxis Tundra Shard", "=ds=#h4#", "17%" },
 		{ 60388, "inv_bracer_19", "=q3=Mariner's Cuffs", "=ds=#a3#, #s8#", "17%" },
+		{ 0, "", "", "", "" },
 		{ 60389, "inv_jewelry_ring_04", "=q4=The Frigid Star Ring", "=ds=#s13#", "15%" },
 		{ 60390, "inv_chest_leather_10", "=q4=Jacket of the Scarlet Admiral", "=ds=#a2#, #s5#", "15%" },
 	};
@@ -594,7 +603,6 @@ AtlasLoot_Data["AtlasLootWBItems"] = {
 	};
 	MargontheMighty = {
 		{ 61531, "INV_Misc_Gem_Pearl_01", "=q3=Glowing Black Pearl", "=ds=#s14#", "33%" },
-		{ 0, "", "", "", "" },
 		{ 61532, "INV_Hammer_16", "=q3=Giants Heavy Mace", "=ds=#h2#, #w6#", "33%" },
 		{ 61534, "INV_Spear_04", "=q3=Fisher's Harpoon", "=ds=#h2#, #w7#", "33%" },
 		{ 0, "", "", "", "" },