A bunch of refinements. Tooltips still not working.