Removed an unnecessary choice from criteriaSetsMatrix. Also added the default attributes on criteriaThresholds, which I forgot.