--- a/KBF.lua	Mon Dec 13 09:01:53 2010 -0600
+++ b/KBF.lua	Tue Dec 28 16:54:40 2010 -0600
@@ -54,6 +54,13 @@
 end
 
 function kbf:OnUpdate()
+	-- little custom hax to reposition the alternate power bar
+	-- try really hard to remember not to commit this
+	if PlayerPowerBarAlt:IsShown() then
+		PlayerPowerBarAlt:ClearAllPoints()
+		PlayerPowerBarAlt:SetPoint("BOTTOM", UIParent, "BOTTOM", 0, 233)
+	end
+	
     if self.pollForUnitChange and not InCombatLockdown() then
         if UnitHasVehicleUI("player") then
 			-- only swap if we're in a "real" vehicle with its own actions
@@ -83,9 +90,6 @@
         end
     end
     -- temporary enchants
-    -- TODO: The blizz secure aura header binds both temp enchants
-    -- to the main hand. No support for cancelling weapon enchants
-    -- until this gets fixed up
     local tempEnchant = self.secureFrame:GetAttribute("tempEnchant1")
     if tempEnchant and tempEnchant:IsShown() then
         if self.dirty or true then
@@ -101,6 +105,12 @@
         end
         self:UpdateBarExpirationTime(tempEnchant)
         buffCount = buffCount + 1
+        -- SAH binds the offhand enchant to the main hand for removal purposes.
+        -- fix it up if we're out of combat
+        -- TODO: maybe this should only happen if we're dirty
+        if not InCombatLockdown() then
+        	tempEnchant:SetAttribute('target-slot', 17)
+       	end
     end
     -- there's also a third temp enchant for thrown weapons, which the 
     -- current SAH doesn't support at all.