add tooltips and small fix naming