add tooltips, other tweaks