Index: lams_central/src/flash/org/lamsfoundation/lams/authoring/Activity.as
===================================================================
diff -u -r340fd43fe1ab7effe65e14c708e501c2d1d3f55b -r9e23178ed0623fbe7d5154b941e4d477aec95120
--- lams_central/src/flash/org/lamsfoundation/lams/authoring/Activity.as	(.../Activity.as)	(revision 340fd43fe1ab7effe65e14c708e501c2d1d3f55b)
+++ lams_central/src/flash/org/lamsfoundation/lams/authoring/Activity.as	(.../Activity.as)	(revision 9e23178ed0623fbe7d5154b941e4d477aec95120)
@@ -55,34 +55,32 @@
     // Instance variables
     //---------------------------------------------------------------------
 	
-	private var _objectType:String;				
-	private var _activityTypeID:Number;			
+	private var _objectType:String;			//*	
+	private var _activityTypeID:Number;		//*	
 
 	
 	private var _activityID:Number;				
-	private var _activityCategoryID:Number;				
+	private var _activityCategoryID:Number;	//*			
 	
-	private var _activityUIID:Number;
+	private var _activityUIID:Number;			//*
 
-	private var _learningLibraryID:Number;		
+	private var _learningLibraryID:Number;		//*
 	//TODO: This will be removed by mai this week.
 	private var _learningDesignID:Number;			
 	private var _libraryActivityID:Number;		
 
 	private var _parentActivityID:Number;		
-	
-
 	private var _parentUIID:Number;		
 	
 
 	private var _orderID:Number;		
 	
-	private var _groupingID:Number;
+	private var _groupingID:Number;			
 	private var _groupingUIID:Number;
 	
 	
-	private var _title:String;						
-	private var _description:String;				
+	private var _title:String;					//*	
+	private var _description:String;			//*
 	private var _helpText:String;					
 	private var _xCoord:Number;
 	private var _yCoord:Number;
@@ -91,7 +89,11 @@
 
 
 	private var _runOffline:Boolean;
+	/*
+	* these have now been removed, set in the tool content instead
 	private var _offlineInstructions:String;
+	private var _onlineInstructions:String;
+	*/
 	private var _defineLater:Boolean;
 	private var _createDateTime:Date;
 
@@ -186,7 +188,8 @@
 		dto.libraryActivityUIImage = (_libraryActivityUIImage) ?  _libraryActivityUIImage : Config.STRING_NULL_VALUE;
 		dto.applyGrouping= (_applyGrouping!=null) ?  _applyGrouping : Config.BOOLEAN_NULL_VALUE;
 		dto.runOffline= (_runOffline!=null) ?  _runOffline : Config.BOOLEAN_NULL_VALUE;
-		dto.offlineInstructions = (_offlineInstructions) ?  _offlineInstructions : Config.STRING_NULL_VALUE;
+		//dto.onlineInstructions = (_onlineInstructions) ?  _onlineInstructions: Config.STRING_NULL_VALUE;
+		//dto.offlineInstructions = (_offlineInstructions) ?  _offlineInstructions : Config.STRING_NULL_VALUE;
 		dto.defineLater= (_defineLater!=null) ?  _defineLater : Config.BOOLEAN_NULL_VALUE;
 		dto.createDateTime= (_createDateTime) ?  _createDateTime : Config.DATE_NULL_VALUE;
 		dto.groupingSupportType = (_groupingSupportType) ?  _groupingSupportType : Config.NUMERIC_NULL_VALUE;
@@ -216,7 +219,7 @@
 		n.libraryActivityUIImage = _libraryActivityUIImage;
 		n.applyGrouping = _applyGrouping;
 		n.runOffline = _runOffline;
-		n.offlineInstructions = _offlineInstructions;
+		//n.offlineInstructions = _offlineInstructions;
 		n.defineLater = _defineLater;
 		n.createDateTime = _createDateTime;
 		n.groupingSupportType = _groupingSupportType;
@@ -430,13 +433,6 @@
 		return _runOffline;
 	}
 	
-	public function set offlineInstructions(a:String):Void{
-		_offlineInstructions = a;
-	}
-	public function get offlineInstructions():String{
-		return _offlineInstructions;
-	}
-	
 	public function set defineLater(a:Boolean):Void{
 		_defineLater = a;
 	}
Index: lams_central/src/flash/org/lamsfoundation/lams/authoring/Transition.as
===================================================================
diff -u -r0f75fa4c87f125d9120b6c79445b27ece4da2f16 -r9e23178ed0623fbe7d5154b941e4d477aec95120
--- lams_central/src/flash/org/lamsfoundation/lams/authoring/Transition.as	(.../Transition.as)	(revision 0f75fa4c87f125d9120b6c79445b27ece4da2f16)
+++ lams_central/src/flash/org/lamsfoundation/lams/authoring/Transition.as	(.../Transition.as)	(revision 9e23178ed0623fbe7d5154b941e4d477aec95120)
@@ -14,7 +14,7 @@
 	//Transition properties
 	
 	private var _transitionID:Number;
-	private var _uiID:Number;
+	private var _transitionUIID:Number;
 	private var _fromActivityID:Number;
 	private var _fromUIID:Number;
 	private var _toActivityID:Number;
@@ -28,15 +28,17 @@
 	private var _learningDesignID:Number;
 	
 	
-	function Transition(uiID,
+	function Transition(transitionUIID,
 						fromUIID,
 						toUIID,
 						learningDesignID){
-		_uiID = uiID;
+		_transitionUIID = transitionUIID;
 		_fromUIID = fromUIID;
 		_toUIID = toUIID;
 		_learningDesignID = learningDesignID;
 		
+		Debugger.log('Created a new transition, transitionUIID:'+transitionUIID,Debugger.GEN,'Constructor','Transition');
+		
 	}
 
 	
@@ -50,14 +52,13 @@
 	public function toData():Object{
 		var dto:Object = new Object();
 		dto.transitionID = (_transitionID) ?  _transitionID : Config.NUMERIC_NULL_VALUE;
-		dto.uiID= (_uiID) ?  _uiID : Config.NUMERIC_NULL_VALUE;
+		dto.transitionUIID= (transitionUIID) ?  transitionUIID : Config.NUMERIC_NULL_VALUE;
 		dto.fromActivityID = (_fromActivityID) ?  _fromActivityID : Config.NUMERIC_NULL_VALUE;
 		dto.fromUIID = (_fromUIID) ?  _fromUIID : Config.NUMERIC_NULL_VALUE;
 		dto.toActivityID = (_toActivityID) ?  _toActivityID : Config.NUMERIC_NULL_VALUE;
 		dto.toUIID = (_toUIID) ?  _toUIID : Config.NUMERIC_NULL_VALUE;
 		dto.title = (_title) ?  _title : Config.STRING_NULL_VALUE;
 		dto.description = (_description) ?  _description : Config.STRING_NULL_VALUE;
-		 Debugger.log('Config.DATE_NULL_VALUE:' + Config.DATE_NULL_VALUE,Debugger.GEN,'toData','Canvas');
 		dto.createDateTime = (_createDateTime) ?  _createDateTime : Config.DATE_NULL_VALUE;
 		dto.learningDesignID = (_learningDesignID) ?  _learningDesignID : Config.NUMERIC_NULL_VALUE;
 		return dto;
@@ -70,12 +71,13 @@
 		return _transitionID;
 	}
 
-	public function set uiID(a:Number):Void{
-		_uiID = a;
+	public function set transitionUIID(a:Number):Void{
+		_transitionUIID = a;
+	}
+	
+	public function get transitionUIID():Number{
+		return _transitionUIID;
 	}
-	public function get uiID():Number{
-		return _uiID;
-	}
 	
 	public function set fromActivityID(a:Number):Void{
 		_fromActivityID = a;