Fixed up existing tooltips, and added a few more.
Closed branch.