Added tooltips and a few more names