fixing two bugs with tooltips... one more to go!