diff --git a/DBM-Raids-WoD/BlackrockFoundry/Darmac.lua b/DBM-Raids-WoD/BlackrockFoundry/Darmac.lua
index 806b6c0..c8b5539 100644
--- a/DBM-Raids-WoD/BlackrockFoundry/Darmac.lua
+++ b/DBM-Raids-WoD/BlackrockFoundry/Darmac.lua
@@ -352,7 +352,7 @@ function mod:INSTANCE_ENCOUNTER_ENGAGE_UNIT()
 	for i = 1, 5 do
 		local unitID = "boss"..i
 		local unitGUID = UnitGUID(unitID)
-		if UnitExists(unitID) and not activeBossGUIDS[unitGUID] then
+		if unitGUID and UnitExists(unitID) and not activeBossGUIDS[unitGUID] then
 			activeBossGUIDS[unitGUID] = true
 			local cid = self:GetCIDFromGUID(unitGUID)
 			if cid == 76884 or cid == 76874 or cid == 76945 or cid == 76946 then
diff --git a/DBM-Raids-WoD/BlackrockFoundry/Gruul.lua b/DBM-Raids-WoD/BlackrockFoundry/Gruul.lua
index 5a0bc0f..30c6cb3 100644
--- a/DBM-Raids-WoD/BlackrockFoundry/Gruul.lua
+++ b/DBM-Raids-WoD/BlackrockFoundry/Gruul.lua
@@ -157,7 +157,7 @@ function mod:SPELL_CAST_START(args)
 			end
 		else
 			timerInfernoSliceCD:Start(nil, self.vb.sliceCount+1)
-			local countFormat = self.vb.sliceCount
+			local countFormat = tostring(self.vb.sliceCount)
 			if self.Options.MythicSoakBehavior == "ThreeGroup" then
 				if mythicSoakOrder3Group[self.vb.sliceCount] then
 					countFormat = self.vb.sliceCount.."-"..mythicSoakOrder3Group[self.vb.sliceCount]
diff --git a/DBM-Raids-WoD/HellfireCitadel/Archimonde.lua b/DBM-Raids-WoD/HellfireCitadel/Archimonde.lua
index a47b118..696484e 100644
--- a/DBM-Raids-WoD/HellfireCitadel/Archimonde.lua
+++ b/DBM-Raids-WoD/HellfireCitadel/Archimonde.lua
@@ -970,11 +970,11 @@ function mod:SPELL_AURA_APPLIED(args)
 				else--red lines for non player lines
 					--Create Points
 					if self.Options.NamesWroughtHud then
-						DBM.HudMap:RegisterRangeMarkerOnPartyMember(186123, "party", args.sourceName, 0.35, time, nil, nil, nil, 0.5, nil, false):Appear():SetLabel(args.sourceName, nil, nil, nil, nil, nil, 0.8, nil, -13, 8, nil)
-						DBM.HudMap:RegisterRangeMarkerOnPartyMember(185014, "party", args.destName, 0.35, time, nil, nil, nil, 0.5, nil, false):Appear():SetLabel(args.destName, nil, nil, nil, nil, nil, 0.8, nil, -13, 8, nil)
+						DBM.HudMap:RegisterRangeMarkerOnPartyMember(186123, "party", args.sourceName, 0.35, time, nil, nil, nil, 0.5):Appear():SetLabel(args.sourceName, nil, nil, nil, nil, nil, 0.8, nil, -13, 8, nil)
+						DBM.HudMap:RegisterRangeMarkerOnPartyMember(185014, "party", args.destName, 0.35, time, nil, nil, nil, 0.5):Appear():SetLabel(args.destName, nil, nil, nil, nil, nil, 0.8, nil, -13, 8, nil)
 					else
-						DBM.HudMap:RegisterRangeMarkerOnPartyMember(186123, "party", args.sourceName, 0.35, time, nil, nil, nil, 0.5, nil, false):Appear()
-						DBM.HudMap:RegisterRangeMarkerOnPartyMember(185014, "party", args.destName, 0.35, time, nil, nil, nil, 0.5, nil, false):Appear()
+						DBM.HudMap:RegisterRangeMarkerOnPartyMember(186123, "party", args.sourceName, 0.35, time, nil, nil, nil, 0.5):Appear()
+						DBM.HudMap:RegisterRangeMarkerOnPartyMember(185014, "party", args.destName, 0.35, time, nil, nil, nil, 0.5):Appear()
 					end
 					--Create Line
 					if self.Options.ExtendWroughtHud3 then
diff --git a/DBM-Raids-WoD/HellfireCitadel/HellfireAssault.lua b/DBM-Raids-WoD/HellfireCitadel/HellfireAssault.lua
index d695e5a..b26c7b0 100644
--- a/DBM-Raids-WoD/HellfireCitadel/HellfireAssault.lua
+++ b/DBM-Raids-WoD/HellfireCitadel/HellfireAssault.lua
@@ -288,7 +288,7 @@ function mod:SPELL_AURA_APPLIED(args)
 			updateRangeFrame(self, true)
 		end
 		if self.Options.HudMapOnAxe then
-			DBM.HudMap:RegisterRangeMarkerOnPartyMember(184369, "highlight", args.destName, 5, 7, 1, 1, 0, 0.5, nil, true, 1):Pulse(0.5, 0.5)
+			DBM.HudMap:RegisterRangeMarkerOnPartyMember(184369, "highlight", args.destName, 5, 7, 1, 1, 0, 0.5):Pulse(0.5, 0.5)
 		end
 	elseif spellId == 180076 then
 		warnSiphon:Show(args.destName)
diff --git a/DBM-Raids-WoD/HellfireCitadel/IronReaver.lua b/DBM-Raids-WoD/HellfireCitadel/IronReaver.lua
index 3dc7337..c0f7669 100644
--- a/DBM-Raids-WoD/HellfireCitadel/IronReaver.lua
+++ b/DBM-Raids-WoD/HellfireCitadel/IronReaver.lua
@@ -316,7 +316,7 @@ function mod:SPELL_AURA_APPLIED(args)
 			end
 		end
 		if self.Options.HudMapOnArt then
-			DBM.HudMap:RegisterRangeMarkerOnPartyMember(spellId, "highlight", args.destName, 5, 13, 1, 1, 0, 0.5, nil, true, 1):Pulse(0.5, 0.5)
+			DBM.HudMap:RegisterRangeMarkerOnPartyMember(spellId, "highlight", args.destName, 5, 13, 1, 1, 0, 0.5):Pulse(0.5, 0.5)
 		end
 		updateRangeFrame(self)
 	elseif spellId == 182020 then
diff --git a/DBM-Raids-WoD/HellfireCitadel/Iskar.lua b/DBM-Raids-WoD/HellfireCitadel/Iskar.lua
index ac8ed8e..481ff04 100644
--- a/DBM-Raids-WoD/HellfireCitadel/Iskar.lua
+++ b/DBM-Raids-WoD/HellfireCitadel/Iskar.lua
@@ -144,9 +144,9 @@ local function showChakram(self)
 	end
 	if ranged and melee and tank then
 		DBM:Debug("All Chakram found!", 2)
-		DBM.HudMap:RegisterRangeMarkerOnPartyMember(182178, "party", ranged, 0.65, 6, nil, nil, nil, 0.8, nil, false):Appear():SetLabel(ranged, nil, nil, nil, nil, nil, 0.8, nil, -15, 8, nil)
-		DBM.HudMap:RegisterRangeMarkerOnPartyMember(182178, "party", melee, 0.65, 6, nil, nil, nil, 0.8, nil, false):Appear():SetLabel(melee, nil, nil, nil, nil, nil, 0.8, nil, -15, 8, nil)
-		DBM.HudMap:RegisterRangeMarkerOnPartyMember(182178, "party", tank, 0.65, 6, nil, nil, nil, 0.8, nil, false):Appear():SetLabel(tank, nil, nil, nil, nil, nil, 0.8, nil, -15, 8, nil)
+		DBM.HudMap:RegisterRangeMarkerOnPartyMember(182178, "party", ranged, 0.65, 6, nil, nil, nil, 0.8):Appear():SetLabel(ranged, nil, nil, nil, nil, nil, 0.8, nil, -15, 8, nil)
+		DBM.HudMap:RegisterRangeMarkerOnPartyMember(182178, "party", melee, 0.65, 6, nil, nil, nil, 0.8):Appear():SetLabel(melee, nil, nil, nil, nil, nil, 0.8, nil, -15, 8, nil)
+		DBM.HudMap:RegisterRangeMarkerOnPartyMember(182178, "party", tank, 0.65, 6, nil, nil, nil, 0.8):Appear():SetLabel(tank, nil, nil, nil, nil, nil, 0.8, nil, -15, 8, nil)
 		if playerName == melee or playerName == ranged or playerName == tank then--Player in it, Yellow lines
 			DBM.HudMap:AddEdge(1, 1, 0, 0.5, 6, ranged, melee, nil, nil, nil, nil)
 			DBM.HudMap:AddEdge(1, 1, 0, 0.5, 6, melee, tank, nil, nil, nil, nil)
diff --git a/DBM-Raids-WoD/HellfireCitadel/Mannoroth.lua b/DBM-Raids-WoD/HellfireCitadel/Mannoroth.lua
index 25f2956..5960783 100644
--- a/DBM-Raids-WoD/HellfireCitadel/Mannoroth.lua
+++ b/DBM-Raids-WoD/HellfireCitadel/Mannoroth.lua
@@ -549,7 +549,7 @@ function mod:SPELL_AURA_APPLIED(args)
 			end
 		end
 		if self.Options.HudMapOnGaze2 then
-			DBM.HudMap:RegisterRangeMarkerOnPartyMember(spellId, "highlight", args.destName, 8, 8, nil, nil, nil, 0.5, nil, true):Appear():SetLabel(args.destName)
+			DBM.HudMap:RegisterRangeMarkerOnPartyMember(spellId, "highlight", args.destName, 8, 8, nil, nil, nil, 0.5):Appear():SetLabel(args.destName)
 		end
 	elseif spellId == 181119 then
 		local amount = args.amount or 1
diff --git a/DBM-Raids-WoD/HellfireCitadel/Socrethar.lua b/DBM-Raids-WoD/HellfireCitadel/Socrethar.lua
index a780d3c..9f1b608 100644
--- a/DBM-Raids-WoD/HellfireCitadel/Socrethar.lua
+++ b/DBM-Raids-WoD/HellfireCitadel/Socrethar.lua
@@ -145,16 +145,16 @@ function mod:ChargeTarget(targetname, uId)
 	if self.Options.HudMapOnCharge then
 		local currentTank = self:GetCurrentTank(90296)
 		if currentTank then
-			DBM.HudMap:RegisterRangeMarkerOnPartyMember(182051, "party", targetname, 0.35, 4, nil, nil, nil, 0.5, nil, false):Appear():SetLabel(targetname, nil, nil, nil, nil, nil, 0.8, nil, -13, 8, nil)
+			DBM.HudMap:RegisterRangeMarkerOnPartyMember(182051, "party", targetname, 0.35, 4, nil, nil, nil, 0.5):Appear():SetLabel(targetname, nil, nil, nil, nil, nil, 0.8, nil, -13, 8, nil)
 			if targetname == UnitName("player") then
 				DBM.HudMap:AddEdge(1, 1, 0, 0.5, 4, currentTank, targetname, nil, nil, nil, nil, 125)
 			else
-				DBM.HudMap:RegisterRangeMarkerOnPartyMember(182051, "party", UnitName("player"), 0.7, 4, nil, nil, nil, 1, nil, false):Appear()
+				DBM.HudMap:RegisterRangeMarkerOnPartyMember(182051, "party", UnitName("player"), 0.7, 4, nil, nil, nil, 1):Appear()
 				DBM.HudMap:AddEdge(1, 0, 0, 0.5, 4, currentTank, targetname, nil, nil, nil, nil, 125)
 			end
 		else--Old school
 			DBM:Debug("Tank Detection Failure in HudMapOnCharge", 2)
-			DBM.HudMap:RegisterRangeMarkerOnPartyMember(182051, "highlight", targetname, 5, 4, 1, 0, 0, 0.5, nil, true, 2):Pulse(0.5, 0.5)
+			DBM.HudMap:RegisterRangeMarkerOnPartyMember(182051, "highlight", targetname, 5, 4, 1, 0, 0, 0.5):Pulse(0.5, 0.5)
 		end
 	end
 	if self.Options.SetIconOnCharge then
@@ -383,7 +383,7 @@ function mod:SPELL_AURA_APPLIED(args)
 			warnVolatileFelOrb:Show(args.destName)
 		end
 		if self.Options.HudMapOnOrb then
-			DBM.HudMap:RegisterRangeMarkerOnPartyMember(180221, "highlight", args.destName, 5, 20, 1, 1, 0, 0.5, nil, true, 1):Pulse(0.5, 0.5)
+			DBM.HudMap:RegisterRangeMarkerOnPartyMember(180221, "highlight", args.destName, 5, 20, 1, 1, 0, 0.5):Pulse(0.5, 0.5)
 		end
 	elseif spellId == 190466 then
 		if args.sourceGUID == UnitGUID("player") then
diff --git a/DBM-Raids-WoD/HellfireCitadel/Velhari.lua b/DBM-Raids-WoD/HellfireCitadel/Velhari.lua
index fd6dbb1..026abc3 100644
--- a/DBM-Raids-WoD/HellfireCitadel/Velhari.lua
+++ b/DBM-Raids-WoD/HellfireCitadel/Velhari.lua
@@ -132,7 +132,7 @@ function mod:AnnTarget(targetname, uId)
 		warnAnnihilationStrike:Show(self.vb.annihilationCount, targetname)
 	end
 	if self.Options.HudMapOnStrike then
-		DBM.HudMap:RegisterRangeMarkerOnPartyMember(180260, "highlight", targetname, 3, 4, 1, 0, 0, 0.5, nil, true, 2):Pulse(0.5, 0.5)
+		DBM.HudMap:RegisterRangeMarkerOnPartyMember(180260, "highlight", targetname, 3, 4, 1, 0, 0, 0.5):Pulse(0.5, 0.5)
 	end
 end
 
@@ -257,7 +257,7 @@ function mod:SPELL_AURA_APPLIED(args)
 			specWarnEdictofCondemnationOther:ScheduleVoice(5, "gather")
 		end
 		if self.Options.HudMapEdict2 then
-			DBM.HudMap:RegisterRangeMarkerOnPartyMember(spellId, "highlight", args.destName, 3, 9, 1, 1, 0, 0.5, nil, true, 1):Pulse(0.5, 0.5)
+			DBM.HudMap:RegisterRangeMarkerOnPartyMember(spellId, "highlight", args.destName, 3, 9, 1, 1, 0, 0.5):Pulse(0.5, 0.5)
 		end
 	elseif args:IsSpellID(180166, 185237) then--Casts
 		self.vb.touchofHarmCount = self.vb.touchofHarmCount + 1
diff --git a/DBM-Raids-WoD/HellfireCitadel/Zakuun.lua b/DBM-Raids-WoD/HellfireCitadel/Zakuun.lua
index 4d07c72..a73b714 100644
--- a/DBM-Raids-WoD/HellfireCitadel/Zakuun.lua
+++ b/DBM-Raids-WoD/HellfireCitadel/Zakuun.lua
@@ -139,15 +139,15 @@ local function warnSeeds(self)
 		end
 		if self.Options.HudMapOnSeeds then
 			if i == 1 then--Yellow to match Star
-				DBM.HudMap:RegisterRangeMarkerOnPartyMember(181508, "star", targetName, 3, 13, 1, 1, 1, 0.5, nil, true):Pulse(0.5, 0.5)
+				DBM.HudMap:RegisterRangeMarkerOnPartyMember(181508, "star", targetName, 3, 13, 1, 1, 1, 0.5):Pulse(0.5, 0.5)
 			elseif i == 2 then--Orange to match Circle
-				DBM.HudMap:RegisterRangeMarkerOnPartyMember(181508, "circle", targetName, 3, 13, 1, 1, 1, 0.5, nil, true):Pulse(0.5, 0.5)
+				DBM.HudMap:RegisterRangeMarkerOnPartyMember(181508, "circle", targetName, 3, 13, 1, 1, 1, 0.5):Pulse(0.5, 0.5)
 			elseif i == 3 then--Purple to match Diamond
-				DBM.HudMap:RegisterRangeMarkerOnPartyMember(181508, "diamond", targetName, 3, 13, 1, 1, 1, 0.5, nil, true):Pulse(0.5, 0.5)
+				DBM.HudMap:RegisterRangeMarkerOnPartyMember(181508, "diamond", targetName, 3, 13, 1, 1, 1, 0.5):Pulse(0.5, 0.5)
 			elseif i == 4 then--Green to match Triangle
-				DBM.HudMap:RegisterRangeMarkerOnPartyMember(181508, "triangle", targetName, 3, 13, 1, 1, 1, 0.5, nil, true):Pulse(0.5, 0.5)
+				DBM.HudMap:RegisterRangeMarkerOnPartyMember(181508, "triangle", targetName, 3, 13, 1, 1, 1, 0.5):Pulse(0.5, 0.5)
 			else--White to match  Moon
-				DBM.HudMap:RegisterRangeMarkerOnPartyMember(181508, "moon", targetName, 3, 13, 1, 1, 1, 0.5, nil, true):Pulse(0.5, 0.5)
+				DBM.HudMap:RegisterRangeMarkerOnPartyMember(181508, "moon", targetName, 3, 13, 1, 1, 1, 0.5):Pulse(0.5, 0.5)
 			end
 		end
 	end
diff --git a/DBM-Raids-WoD/Highmaul/Koragh.lua b/DBM-Raids-WoD/Highmaul/Koragh.lua
index bd748d0..fe88871 100644
--- a/DBM-Raids-WoD/Highmaul/Koragh.lua
+++ b/DBM-Raids-WoD/Highmaul/Koragh.lua
@@ -276,7 +276,7 @@ function mod:SPELL_AURA_APPLIED(args)
 				lastX, LastY = UnitPosition("player")
 				self:Schedule(7, returnPosition, self)
 				if self.Options.HudMapForFel then
-					DBM.HudMap:RegisterStaticMarkerOnPartyMember(spellId, "highlight", args.destName, 3, 12, 0, 1, 0, 0.5, nil, nil, 4):Pulse(0.5, 0.5)
+					DBM.HudMap:RegisterStaticMarkerOnPartyMember(spellId, "highlight", args.destName, 3, 12, 0, 1, 0, 0.5):Pulse(0.5, 0.5)
 				end
 			end
 		end