Fix for flickering Building tooltips, plus other minor changes

I tested this in Chrome only; seems to work well.  I probably should have done these in a separate branch or something... I'm not very experienced with git and github.  Let me know if yo want me to change anything.