Cleanup the tooltip patch

There was a lot of hacking around to get it working, but now that it is, it could do with some serious refactoring to make it easy to update and borrow from in later projects. Its like a jungle in there...