Even more tooltips improvements...