diff --git a/sim/shaman/fire_elemental_totem.go b/sim/shaman/fire_elemental_totem.go
index aca29a48f7..f465112ba9 100644
--- a/sim/shaman/fire_elemental_totem.go
+++ b/sim/shaman/fire_elemental_totem.go
@@ -74,7 +74,7 @@ func (shaman *Shaman) registerFireElementalTotem() {
 			success := false
 			if enhTier10Aura != nil && shaman.Totems.EnhTierTenBonus {
 				if enhTier10Aura.IsActive() {
-					success = shaman.fireElementalSnapShot.CanSnapShot(sim, enhTier10Aura.RemainingDuration(sim))
+					success = shaman.fireElementalSnapShot.CanSnapShot(sim, castWindow)
 				}
 			} else if sim.CurrentTime > 1*time.Second && shaman.fireElementalSnapShot == nil {
 				success = true
diff --git a/sim/shaman/shaman.go b/sim/shaman/shaman.go
index 456ee2179a..2cb014c885 100644
--- a/sim/shaman/shaman.go
+++ b/sim/shaman/shaman.go
@@ -397,6 +397,9 @@ func (shaman *Shaman) setupProcTrackers() {
 	snapshotManager.AddProc(71561, "Deathbringer's Will H Agility Proc", false)
 	snapshotManager.AddProc(71492, "Deathbringer's Will AP Proc", false)
 	snapshotManager.AddProc(71561, "Deathbringer's Will H AP Proc", false)
+
+	// Tier Bonus
+	snapshotManager.AddProc(70831, "Maelstrom Power", false)
 }
 
 func (shaman *Shaman) setupFireElementalCooldowns() {
diff --git a/ui/core/components/fire_elemental_inputs.ts b/ui/core/components/fire_elemental_inputs.ts
index 218d3a4ae4..f103f7af27 100644
--- a/ui/core/components/fire_elemental_inputs.ts
+++ b/ui/core/components/fire_elemental_inputs.ts
@@ -36,8 +36,8 @@ export function FireElementalSection(parentElem: HTMLElement, simUI: IndividualS
 
     new NumberPicker(contentBlock.bodyElement, simUI.player, {
         positive: true,
-        label: "Bonus Spellpower",
-		labelTooltip: "Bonus Spellpower to snapshot Fire Elemental with. Will prioritize dropping Fire Elemental if greater then 0",
+        label: "Bonus spell power",
+		labelTooltip: "Bonus spell power to snapshot Fire Elemental with. Will prioritize dropping Fire Elemental if greater then 0",
 		inline: true,
         getValue: (player: Player<ShamanSpecs>) =>  player.getRotation().totems?.bonusSpellpower || 0,
 		setValue: (eventID: EventID, player: Player<ShamanSpecs>, newVal: number) => {