More clean up, bug fix for checkbox submission