Feature/tooltips improvements

As per @jakesyl, creating a new PR pointing at `dev`