clean up + fixed tooltips