cleanup and add some tooltips