Index: lams_central/web/lams_authoring.swf
===================================================================
diff -u -rb365bfb0ceb516dcf01316100cf218de71fb324e -r77eee398c52fbbce73bd7df19e8f5b1d5ad651fe
Binary files differ
Index: lams_central/web/lams_authoring_library.swf
===================================================================
diff -u -rb365bfb0ceb516dcf01316100cf218de71fb324e -r77eee398c52fbbce73bd7df19e8f5b1d5ad651fe
Binary files differ
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/ToolOutputDefinition.as
===================================================================
diff -u -r317cecb7b29393ac71b1989dbfc6c618773698ac -r77eee398c52fbbce73bd7df19e8f5b1d5ad651fe
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/ToolOutputDefinition.as	(.../ToolOutputDefinition.as)	(revision 317cecb7b29393ac71b1989dbfc6c618773698ac)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/ToolOutputDefinition.as	(.../ToolOutputDefinition.as)	(revision 77eee398c52fbbce73bd7df19e8f5b1d5ad651fe)
@@ -39,7 +39,7 @@
 	private var _startValue:Object;
 	private var _endValue:Object;
 	
-	function ToolOutputCondition(){
+	function ToolOutputDefinition(){
 	}
 	
 	public function populateFromDTO(dto:Object):Void {
@@ -68,6 +68,14 @@
 	
 	public function get name():String {
 		return _name;
+	}
+	
+	public function set description(a:String) {
+		_description = a;
+	}
+	
+	public function get description():String {
+		return _description;
 	}
 	
 	public function set type(a:String) {
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/ToolOutputConditionsDialog.as
===================================================================
diff -u -r9aab591f71aa913ad9b848d8cd406728c171470b -r77eee398c52fbbce73bd7df19e8f5b1d5ad651fe
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/ToolOutputConditionsDialog.as	(.../ToolOutputConditionsDialog.as)	(revision 9aab591f71aa913ad9b848d8cd406728c171470b)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/ToolOutputConditionsDialog.as	(.../ToolOutputConditionsDialog.as)	(revision 77eee398c52fbbce73bd7df19e8f5b1d5ad651fe)
@@ -256,13 +256,18 @@
 	}
 	
 	private function clearAllButton_onPress():Void {
+		for(var i=0; i < _condition_item_dgd.dataProvider.length; i++) {
+			app.getCanvas().ddm.removeOutputCondition(ToolOutputCondition(_condition_item_dgd.dataProvider[i].data).conditionUIID);
+		}
+		
 		_condition_item_dgd.removeAll();
 	}
 	
 	private function removeItemButton_onPress():Void {
-		var selectedItem = _condition_item_dgd.getItemAt(_condition_item_dgd.selectedIndex);
-		app.getCanvas().ddm.removeOutputCondition(selectedItem.conditionUIID);
+		var _selectedItem:ToolOutputCondition = ToolOutputCondition(_condition_item_dgd.dataProvider[_condition_item_dgd.selectedIndex].data);
 		
+		app.getCanvas().ddm.removeOutputCondition(_selectedItem.conditionUIID);
+		
 		_condition_item_dgd.removeItemAt(_condition_item_dgd.selectedIndex);
 	}
 	
@@ -440,14 +445,14 @@
 		_definitions = new Array();
 		
 		for(var i=0; i< a.length; i++) {
-			var newTOD = new ToolOutputDefinition();
+			var newTOD:ToolOutputDefinition = new ToolOutputDefinition();
 			newTOD.populateFromDTO(a[i]);
 			
 			_definitions.push(newTOD);
 		}
 		
 		_toolOutputDefin_cmb.dataProvider = _definitions;
-		_toolOutputDefin_cmb.labelFunction = function(itemObj){
+		_toolOutputDefin_cmb.labelFunction = function(itemObj) {
 			return (itemObj.description + " (" + ToolOutputConditionsDialog.getOutputType(itemObj.type) + ")");
 		}
 		
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/Canvas.as
===================================================================
diff -u -r6f4fd0fe7fee43ab750ec98ea12fb3f1b4cb07b5 -r77eee398c52fbbce73bd7df19e8f5b1d5ad651fe
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/Canvas.as	(.../Canvas.as)	(revision 6f4fd0fe7fee43ab750ec98ea12fb3f1b4cb07b5)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/Canvas.as	(.../Canvas.as)	(revision 77eee398c52fbbce73bd7df19e8f5b1d5ad651fe)
@@ -94,10 +94,10 @@
 
 
 		//Add listener to view so that we know when it's loaded
-        canvasView.addEventListener('load',Proxy.create(this,viewLoaded));
+        canvasView.addEventListener('load', Proxy.create(this,viewLoaded));
         
-		_ddm.addEventListener('ddmUpdate',Proxy.create(this,onDDMUpdated));
-		_ddm.addEventListener('ddmBeforeUpdate',Proxy.create(this,onDDMBeforeUpdate));
+		_ddm.addEventListener('ddmUpdate', Proxy.create(this,onDDMUpdated));
+		_ddm.addEventListener('ddmBeforeUpdate', Proxy.create(this,onDDMBeforeUpdate));
 		
         //Register view with model to receive update events
 		canvasModel.addObserver(canvasView);
@@ -517,7 +517,7 @@
 		
 		if(r.length > 0) {
 			for(var i=0; i < r.length; i++) {
-				Debugger.log("adding def: " + r[i].name, Debugger.CRITICAL, "setToolOutputDefinitions", "Canvas");
+				Debugger.log("adding def: " + r[i].name + " desc: " + r[i].description, Debugger.CRITICAL, "setToolOutputDefinitions", "Canvas");
 				toolActivity.addDefinition(r[i]);
 			}
 		}