checkbox tooltips and minor refactoring