Improvements to tooltips..