Bug fixes.

diff --git a/Modules/Fade/Fade.lua b/Modules/Fade/Fade.lua
index ac79d7f..94c4cd0 100644
--- a/Modules/Fade/Fade.lua
+++ b/Modules/Fade/Fade.lua
@@ -128,7 +128,7 @@ local checkTooltipAlpha = function()
 end

 function mod:OnShow()
-	if UnitExists(StarTip.unit or "mouseover") then
+	if UnitExists(StarTip.unit) then
 		updateExistenceFrame:SetScript("OnUpdate", checkExistence)
 	else
 		updateAlphaFrame:SetScript("OnUpdate", checkTooltipAlpha)
@@ -196,4 +196,5 @@ end

 function mod:SetUnit()
 	self.isUnit = true
+	updateExistenceFrame:SetScript("OnUpdate", checkExistence)
 end
diff --git a/StarTip.lua b/StarTip.lua
index 561dc35..f6b3ef1 100644
--- a/StarTip.lua
+++ b/StarTip.lua
@@ -509,7 +509,9 @@ StarTip.tooltipMain.Hide = function()
 	StarTip.tooltipMain:HideReal()
 end
 StarTip.tooltipMain.FadeOut = function()
-	StarTip.tooltipMain.flash:FadeOut(1, 1, 0)
+	if StarTip.tooltipMain:IsShown() and StarTip.tooltipMain:GetAlpha() == 1 then
+		StarTip.tooltipMain.flash:FadeOut(1, 1, 0)
+	end
 end

 local trunk = {}
@@ -771,6 +773,7 @@ function StarTip.OnTooltipSetUnit(...)
 		unit = "mouseover"
 	end

+	StarTip.owner = GameTooltip:GetOwner()
 	StarTip.unit = unit
 	environment.unit = unit