Minor changes, WIP
Tooltips and display info