Another round of tooltip fix-ups
Merge pull request #7 from alfbr/master

Another round of tooltip fix-ups