diff --git a/changelog.txt b/changelog.txt
index ca97eb3..8c366a7 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,10 @@
+================================================
+Version 0.9.4.7 - Alpha (December 19 - 2012)
+================================================
+[FIXED] textinput:SetFocus(focus) not working properly
+
+[CHANGED] the tooltip object is now positionable via the standard positioning methods when not set to follow the cursor
+
 ================================================
 Version 0.9.4.6 - Alpha (December 10 - 2012)
 ================================================
diff --git a/debug.lua b/debug.lua
index 1e9c196..085ad9f 100644
--- a/debug.lua
+++ b/debug.lua
@@ -124,7 +124,7 @@ end
 
 --[[---------------------------------------------------------
 	- func: ExamplesMenu()
-	- desc: generates a list of examples of LÖVE Frames
+	- desc: generates a list of examples of Love Frames
 			objects
 --]]---------------------------------------------------------
 function loveframes.debug.ExamplesMenu()
diff --git a/init.lua b/init.lua
index 04902e5..c5b0a71 100644
--- a/init.lua
+++ b/init.lua
@@ -9,7 +9,7 @@ loveframes = {}
 -- library info
 loveframes.info                      = {}
 loveframes.info.author               = "Kenny Shields"
-loveframes.info.version              = "0.9.4.6"
+loveframes.info.version              = "0.9.4.7"
 loveframes.info.stage                = "Alpha"
 
 -- library configurations
diff --git a/objects/internal/tooltip.lua b/objects/internal/tooltip.lua
index 7702f8d..6e40151 100644
--- a/objects/internal/tooltip.lua
+++ b/objects/internal/tooltip.lua
@@ -85,9 +85,6 @@ function newobject:update(dt)
 				local x, y = love.mouse.getPosition()
 				self.x = x + self.xoffset
 				self.y = y - self.height + self.yoffset
-			else
-				self.x = object.x + self.xoffset
-				self.y = object.y - self.height + self.yoffset
 			end
 			
 			if not top then
@@ -176,6 +173,8 @@ end
 function newobject:SetObject(object)
 
 	self.object = object
+	self.x = object.x
+	self.y = object.y
 	
 end
 
diff --git a/objects/textinput.lua b/objects/textinput.lua
index e17caba..ac79ec1 100644
--- a/objects/textinput.lua
+++ b/objects/textinput.lua
@@ -1062,19 +1062,19 @@ function newobject:SetFocus(focus)
 	self.focus = focus
 	
 	if focus then
+		loveframes.inputobject = self
 		if onfocusgained then
 			onfocusgained(self)
 		end
 	else
+		if inputobject == self then
+			loveframes.inputobject = false
+		end
 		if onfocuslost then
 			onfocuslost(self)
 		end
 	end
 	
-	if inputobject == self then
-		loveframes.inputobject = false
-	end
-	
 end
 
 --[[---------------------------------------------------------