tooltips 'n' stuff
kind of fixed text boxes
Merge branch 'master' into gh-pages