Merge pull request #9 from Roll20/master

update
tooltips and fixes

last update before deadline
Merge pull request #200 from alicia86/master

tooltips and fixes