Added tooltips.
Merge branch 'tooltips'