test, and clean up checkbox code.