tooltips and minor changes