more cleanup and introducing tooltips