adding tooltips and some minor edits