Bugfix

diff --git a/Modules/Text.lua b/Modules/Text.lua
index 25ab8f6..eddcd29 100644
--- a/Modules/Text.lua
+++ b/Modules/Text.lua
@@ -86,9 +86,8 @@ if not UnitExists(unit) then return end
 local health, max = UnitHealth(unit), UnitHealthMax(unit)
 return HPColor(health, max)
 ]],
-		cols = 15,
+		cols = 20,
 		update = 1000,
-		dontRtrim = true,
 		point = {"TOPLEFT", "GameTooltip", "BOTTOMLEFT", 0, 1},
 		parent = "GameTooltip"
 	},
@@ -106,9 +105,9 @@ if not UnitExists(unit) then return end
 local mana, max = UnitMana(unit), UnitManaMax(unit)
 return HPColor(mana, max)
 ]],
-		cols = 15,
+		cols = 20,
 		update = 1000,
-		dontRtrim = true,
+		align = WidgetText.ALIGN_RIGHT,
 		point = {"TOPRIGHT", "GameTooltip", "BOTTOMRIGHT", 0, 1},
 		parent = "GameTooltip"
 	},
diff --git a/StarTip.lua b/StarTip.lua
index c283ba3..63ff676 100644
--- a/StarTip.lua
+++ b/StarTip.lua
@@ -561,33 +561,35 @@ end
 function StarTip.OnTooltipSetUnit()
 	local unit = GameTooltip:GetUnit()
 	StarTip.unit = "mouseover"
-	for i, v in ipairs(SINGLETON_CLASSIFICATIONS) do
-		if unit == UnitName(v) then
-			StarTip.unit = v
-		end
-	end
-	if UnitInRaid("player") and StarTip.unit == "mouseover" then
-		for i=1, GetNumRaidMembers() do
-			for i, v in ipairs(UNIT_RAID_GROUPS) do
-				if unit == UnitName(v .. i) then
-					StarTip.unit = v .. i
-					break
+	if not UnitExists("mouseover") then
+		if UnitInRaid("player") then
+			for i=1, GetNumRaidMembers() do
+				for i, v in ipairs(UNIT_RAID_GROUPS) do
+					if unit == UnitName(v .. i) then
+						StarTip.unit = v .. i
+						break
+					end
 				end
+				if StarTip.unit ~= "mouseover" then break end
 			end
-			if StarTip.unit ~= "mouseover" then break end
-		end
-	elseif UnitInParty("player") and StarTip.unit == "mouseover" then
-		for i=1, GetNumPartyMembers() do
-			for i, v in ipairs(UNIT_PARTY_GROUPS) do
-				if unit == UnitName(v .. i) then
-					StarTip.unit = v .. i
-					break
+		elseif UnitInParty("player") then
+			for i=1, GetNumPartyMembers() do
+				for i, v in ipairs(UNIT_PARTY_GROUPS) do
+					if unit == UnitName(v .. i) then
+						StarTip.unit = v .. i
+						break
+					end
 				end
+				if StarTip.unit ~= "mouseover" then break end
+			end
+		end
+		for i, v in ipairs(SINGLETON_CLASSIFICATIONS) do
+			if unit == UnitName(v) then
+				StarTip.unit = v
 			end
-			if StarTip.unit ~= "mouseover" then break end
 		end
 	end
-
+
 	if not StarTip.justSetUnit then
 		for k, v in StarTip:IterateModules() do
 			if v.SetUnit and v:IsEnabled() then v:SetUnit() end