tooltips and fixes

last update before deadline