diff --git a/Blackwing/Magmaw.lua b/Blackwing/Magmaw.lua
index bf20945..a23ad6b 100644
--- a/Blackwing/Magmaw.lua
+++ b/Blackwing/Magmaw.lua
@@ -14,7 +14,6 @@ mod:SetStage(1)
 --
 
 local isHeadPhase = false
-local firstRefresh = false
 
 --------------------------------------------------------------------------------
 -- Localization
@@ -71,7 +70,6 @@ end
 
 function mod:OnBossEnable()
 	self:RegisterEvent("CHAT_MSG_RAID_BOSS_EMOTE")
-	self:Log("SPELL_AURA_REFRESH", "PointOfVulnerabilityRefresh", 79010)
 	self:Log("SPELL_CAST_START", "MassiveCrash", 88253)
 	self:Log("SPELL_AURA_REMOVED", "MassiveCrashRemoved", 88253)
 	self:Log("SPELL_AURA_APPLIED", "ParasiticInfection", 78097, 78941)
@@ -95,7 +93,6 @@ end
 
 function mod:OnEngage()
 	isHeadPhase = false
-	firstRefresh = false
 	self:SetStage(1)
 	self:Berserk(600)
 	self:Bar("slump", 100, L.slump_bar, 36702)
@@ -144,19 +141,7 @@ do
 	end
 end
 
-function mod:PointOfVulnerabilityRefresh(args)
-	if self:IsEngaged() then
-		if firstRefresh then
-			firstRefresh = false
-			self:Message(79011, "green", args.spellName, false, true) -- XXX TEST
-		else
-			self:Message(79011, "green", CL.over:format(args.spellName), false, true) -- XXX TEST
-		end
-	end
-end
-
 function mod:MassiveCrash(args)
-	firstRefresh = true
 	self:Message("slump", "green", args.spellName, false, true) -- XXX TEST
 end
 
@@ -173,7 +158,7 @@ function mod:ArmageddonApplied(args)
 end
 
 function mod:ArmageddonRemoved(args)
-	self:StopBar(args.spellName)
+	self:StopBar(CL.cast:format(args.spellName))
 end
 
 do
diff --git a/Blackwing/Nefarian.lua b/Blackwing/Nefarian.lua
index c85e33c..5d67061 100644
--- a/Blackwing/Nefarian.lua
+++ b/Blackwing/Nefarian.lua
@@ -18,6 +18,7 @@ local powerTargets = mod:NewTargetList()
 local phase3warned = false
 local shadowblazeHandle, lastBlaze = nil, 0
 local blastNovaCollector = {}
+local currentPercent = 100
 
 --------------------------------------------------------------------------------
 -- Localization
@@ -59,7 +60,7 @@ function mod:GetOptions()
 		81007,
 		80734, -- Blast Nova
 		-- Heroic
-		{79339, "CASTBAR", "SAY", "SAY_COUNTDOWN", "ME_ONLY_EMPHASIZE"}, -- Explosive Cinders
+		{79339, "COUNTDOWN", "SAY", "SAY_COUNTDOWN", "ME_ONLY_EMPHASIZE"}, -- Explosive Cinders
 		79318, -- Dominion
 		"berserk",
 		-- General
@@ -105,6 +106,7 @@ function mod:OnEngage()
 	phase3warned = false
 	shadowblazeHandle, lastBlaze = nil, 0
 	blastNovaCollector = {}
+	currentPercent = 100
 	self:SetStage(1)
 	self:RegisterUnitEvent("UNIT_POWER_FREQUENT", nil, "boss1", "boss2")
 	self:Berserk(630) -- is it really?
@@ -120,7 +122,8 @@ end
 
 function mod:CHAT_MSG_RAID_BOSS_EMOTE(_, msg)
 	if msg:find(L.crackle_trigger, nil, true) and self:IsEngaged() then -- Not during the RP of activating the boss
-		self:Message(81272, "orange", CL.custom_sec:format(self:SpellName(81272), 5))
+		currentPercent = currentPercent - 10
+		self:Message(81272, "orange", CL.percent:format(currentPercent, CL.custom_sec:format(self:SpellName(81272), 5)))
 		self:CastBar(81272, 5) -- Electrocute
 		self:PlaySound(81272, "alert")
 	end
@@ -240,7 +243,7 @@ do
 		if self:Me(args.destGUID) then
 			self:Say(args.spellId, CL.bomb, nil, "Bomb")
 			self:SayCountdown(args.spellId, 8, nil, 5)
-			self:CastBar(args.spellId, 8, CL.bomb)
+			self:TargetBar(args.spellId, 8, args.destName, CL.bomb)
 			self:PlaySound(args.spellId, "warning")
 		end
 	end
@@ -249,7 +252,7 @@ end
 function mod:ExplosiveCindersRemoved(args)
 	if self:Me(args.destGUID) then
 		self:CancelSayCountdown(args.spellId)
-		self:StopBar(CL.cast:format(CL.bomb))
+		self:StopBar(args.spellName, args.destName)
 		self:PersonalMessage(args.spellId, "removed", CL.bomb)
 	end
 end
diff --git a/Blackwing/Omnotron.lua b/Blackwing/Omnotron.lua
index d80c023..c7af217 100644
--- a/Blackwing/Omnotron.lua
+++ b/Blackwing/Omnotron.lua
@@ -110,6 +110,7 @@ function mod:OnBossEnable()
 	self:Log("SPELL_CAST_SUCCESS", "PowerGenerator", 79624)
 	-- Heroic
 	self:Log("SPELL_CAST_SUCCESS", "OverchargedPowerGenerator", 91857)
+	self:Log("SPELL_AURA_APPLIED", "OverchargedPowerGeneratorApplied", 91858)
 	self:Log("SPELL_CAST_START", "GripOfDeath", 91849)
 	self:Log("SPELL_AURA_APPLIED", "EncasingShadowsApplied", 92023)
 	self:Log("SPELL_AURA_APPLIED", "ShadowInfusionApplied", 92048)
@@ -234,7 +235,7 @@ end
 do
 	local prev = 0
 	function mod:ChemicalCloudDamage(args)
-		if self:Me(args.destGUID) and args.time - prev > 2 then
+		if self:Me(args.destGUID) and args.time - prev > 3 then
 			prev = args.time
 			self:PersonalMessage(args.spellId, "underyou")
 			self:PlaySound(args.spellId, "underyou")
@@ -275,6 +276,17 @@ function mod:OverchargedPowerGenerator()
 	self:PlaySound(91879, "info")
 end
 
+do
+	local prev = 0
+	function mod:OverchargedPowerGeneratorApplied(args)
+		if self:Me(args.destGUID) and args.time - prev > 1.5 then
+			prev = args.time
+			self:PersonalMessage(91879, "underyou", L.pool_explosion)
+			self:PlaySound(91879, "underyou")
+		end
+	end
+end
+
 function mod:GripOfDeath(args)
 	self:Message(args.spellId, "orange")
 	self:CDBar("nef", 35, CL.next_ability, L.nef_icon)
@@ -300,7 +312,7 @@ end
 
 function mod:ShadowInfusionRemoved(args)
 	if self:Me(args.destGUID) then
-		self:CancelYellCountdown(args.spellId)
+		self:CancelSayCountdown(args.spellId)
 	end
 end