Adding tooltips and some minor changes