tooltips and a few other details added