added checkbox, minor cosmetic changes