Add tooltips and minor clean-up