Added some tooltips

And tweaked some things...