Index: lams_central/web/lams_authoring.swf
===================================================================
diff -u -r9cff9ef484b8a878642260d5417f1bb407c7f281 -rd3a95038f7512b62b050851b24ae07c140049100
Binary files differ
Index: lams_central/web/lams_authoring_library.swf
===================================================================
diff -u -r9cff9ef484b8a878642260d5417f1bb407c7f281 -rd3a95038f7512b62b050851b24ae07c140049100
Binary files differ
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/ToolOutputConditionsDialog.as
===================================================================
diff -u -r24a933e2927a758498ae27341b19baeb90ca0db3 -rd3a95038f7512b62b050851b24ae07c140049100
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/ToolOutputConditionsDialog.as	(.../ToolOutputConditionsDialog.as)	(revision 24a933e2927a758498ae27341b19baeb90ca0db3)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/ToolOutputConditionsDialog.as	(.../ToolOutputConditionsDialog.as)	(revision d3a95038f7512b62b050851b24ae07c140049100)
@@ -425,7 +425,8 @@
 		_toolOutputDefin_cmb._width = w - 2*_toolOutputDefin_cmb._x;
 		
 		//Buttons
-		remove_item_btn._x = _condition_item_dgd._x + _condition_item_dgd.width - remove_item_btn.width;
+		
+		remove_item_btn._x = _condition_item_dgd._x + _condition_item_dgd._width - remove_item_btn.width;
 		clear_all_btn._x = remove_item_btn._x - clear_all_btn.width - 5;
 		
         close_btn.move(w-xOkOffset,h-yOkOffset);
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspectorControls.as
===================================================================
diff -u -r24a933e2927a758498ae27341b19baeb90ca0db3 -rd3a95038f7512b62b050851b24ae07c140049100
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspectorControls.as	(.../PropertyInspectorControls.as)	(revision 24a933e2927a758498ae27341b19baeb90ca0db3)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspectorControls.as	(.../PropertyInspectorControls.as)	(revision d3a95038f7512b62b050851b24ae07c140049100)
@@ -515,6 +515,8 @@
 			if(e != null) {
 				numGroups_lbl.enabled = e;
 				_group_naming_btn.enabled = e;
+			} else {
+				_group_naming_btn.enabled = false;
 			}
 			
 		} else if(g.groupingTypeID == Grouping.RANDOM_GROUPING) {
@@ -538,6 +540,8 @@
 				numGroups_rdo.enabled = e;
 				
 				_group_naming_btn.enabled = e;
+			} else {
+				_group_naming_btn.enabled = false;
 			}
 			
 			checkGroupRadioOptions(e);
@@ -603,17 +607,17 @@
 			g.numberOfGroups = 0;
 			
 			numRandomGroups_stp.enabled = false;
-			numLearners_stp.enabled = e&&true;
+			numLearners_stp.enabled = (e != null) ? e&&true : true;
 			
 			_group_naming_btn.enabled = false;
 		}else{
-			numRandomGroups_stp.enabled = e&&true;
+			numRandomGroups_stp.enabled = (e != null) ? e&&true : true;
 			numLearners_stp.value = 0;
 			g.learnersPerGroups = 0;
 			
 			numLearners_stp.enabled = false;
 			
-			_group_naming_btn.enabled = (e != null && numRandomGroups_stp.value > 0) ? e&&true : false;
+			_group_naming_btn.enabled = (e != null) ? e&&(numRandomGroups_stp.value > 0) : (numRandomGroups_stp.value > 0);
 		}
 		
 		//this is a crazy hack to stop the steppter dissapearing after its .enabled property is set.
@@ -624,10 +628,14 @@
 	
 	private function checkGroupRadioOptions(e:Boolean) {
 		var g:Grouping = _canvasModel.getCanvas().ddm.getGroupingByUIID(_canvasModel.selectedItem.activity.createGroupingUIID);
+		Debugger.log("checking group radio options: " + g.numberOfGroups, Debugger.CRITICAL, "checkGroupRadioOptions", "PIC*");
 		
-		if(g.numberOfGroups > 0 && g.learnersPerGroups <= 0) { numGroups_rdo.selected = true; _group_naming_btn.enabled = e&&true; }
-		else if(g.learnersPerGroups > 0 && g.numberOfGroups <= 0) { numLearners_rdo.selected = true; _group_naming_btn.enabled = false; }
-		else { numGroups_rdo.selected = true; _group_naming_btn.enabled = false; }
+		if(g.numberOfGroups > 0 && g.learnersPerGroups <= 0) 
+			{ numGroups_rdo.selected = true; _group_naming_btn.enabled = (e != null) ? e&&true : true; }
+		else if(g.learnersPerGroups > 0 && g.numberOfGroups <= 0) 
+			{ numLearners_rdo.selected = true; _group_naming_btn.enabled = false; }
+		else 
+			{ numGroups_rdo.selected = true; _group_naming_btn.enabled = false; }
 	}
 	
 	public function reDrawTroublesomeSteppersLater(){
@@ -667,10 +675,9 @@
 		
 		Debugger.log("updating grouping method data: " + g.groupingUIID, Debugger.CRITICAL, "updateGroupingMethodData", "PropertyInspectorControls");
 		
-		if(!_canvasController.isBusy && evt.type == 'focusOut') {
+		if(!_canvasController.isBusy() && evt.type == 'focusOut') {
 			if(_canvasModel.getCanvas().ddm.hasBranchMappingsForGroupingUIID(g.groupingUIID)) {
 				_canvasController.setBusy();
-			
 				LFMessage.showMessageConfirm("Warning: Existing Group-to-Branch mappings may be effected by your change. Do you wish to continue?", Proxy.create(this, doUpdateGroupingMethodData, g), Proxy.create(this, retainOldGroupingMethodData), "Yes", "No",  "Warning");
 			} else {
 				doUpdateGroupingMethodData(g);
@@ -688,8 +695,13 @@
 			numGroups_stp.value = 0;
 			g.maxNumberOfGroups = 0;
 			
+			Debugger.log("groups: " + g.numberOfGroups, Debugger.CRITICAL, "doUpdateGroupingMethodData", "PIC*");
+			
 			_group_naming_btn.enabled = (numRandomGroups_stp.value > 0) ? true : false;
 			
+			Debugger.log("enabled: " + _group_naming_btn.enabled, Debugger.CRITICAL, "doUpdateGroupingMethodData", "PIC*");
+			
+			
 		}else{
 			g.maxNumberOfGroups = numGroups_stp.value;