Improvements to tooltips (but not done)