tooltips and fixes

last update before review!