better checkboxes
refinements
clean
cleanup and refactoring
cleans up edge cases