Did some work on the tooltips