More work on tooltips