Awesome tooltips!  And a couple other fixes