Minor upgrades. Error in checkboxes present. I believe this is due to unit testing code.