fixed tooltips // other minor fixes