Added tooltips and more info