Index: lams_central/web/lams_authoring.swf
===================================================================
diff -u -r7f6876a94e91244123c836418b11146b78c424dc -re56cc7dce08bb4a9c996c596216440807778112e
Binary files differ
Index: lams_central/web/lams_authoring_library.swf
===================================================================
diff -u -r7f6876a94e91244123c836418b11146b78c424dc -re56cc7dce08bb4a9c996c596216440807778112e
Binary files differ
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/BranchConnector.as
===================================================================
diff -u -r6e921f0eba97c377550ad11dbe6e86fb825c3067 -re56cc7dce08bb4a9c996c596216440807778112e
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/BranchConnector.as	(.../BranchConnector.as)	(revision 6e921f0eba97c377550ad11dbe6e86fb825c3067)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/BranchConnector.as	(.../BranchConnector.as)	(revision e56cc7dce08bb4a9c996c596216440807778112e)
@@ -133,7 +133,9 @@
 	}
 	
 	public function updateBranchLabel():Void {
-		branchLabel = _branch.sequenceActivity.title;
+		if(branchLabel != null)
+			branchLabel = _branch.sequenceActivity.title;
+		
 	}
 	
 	public function set branchLabel(a:String):Void {
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as
===================================================================
diff -u -r7f6876a94e91244123c836418b11146b78c424dc -re56cc7dce08bb4a9c996c596216440807778112e
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as	(.../CanvasModel.as)	(revision 7f6876a94e91244123c836418b11146b78c424dc)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as	(.../CanvasModel.as)	(revision e56cc7dce08bb4a9c996c596216440807778112e)
@@ -832,14 +832,16 @@
 			b.sequenceActivity.isDefault = false;
 			
 			var sequences:Array = _cv.ddm.getComplexActivityChildren(sequence.parentUIID);
-			b.sequenceActivity.orderID = sequences.length;
-			b.setDefaultSequenceName();
+			//b.sequenceActivity.orderID = sequences.length;
+			//b.setDefaultSequenceName();
 			
-			Debugger.log("sequences length (order id): " + sequences.length, Debugger.CRITICAL, "createBranchStartConnector", "CanvasModel");
+			sequences.sortOn("orderID", Array.NUMERIC);
+			var orderID:Number = (sequences.length > 0) ? sequences[sequences.length-1].orderID : 0;
 			
-			var orderID:Number = sequences.length+1;
+			Debugger.log("sequences length (order id): " + orderID, Debugger.CRITICAL, "createBranchStartConnector", "CanvasModel");
 			
-			createNewSequenceActivity(activeView.activity, orderID, null, true);
+			createNewSequenceActivity(activeView.activity, orderID+1, null, true);
+			
 			return b;
 		}
 	}
@@ -883,14 +885,16 @@
 		var sequences:Array = _cv.ddm.getComplexActivityChildren(b.sequenceActivity.parentUIID);
 		
 		SequenceActivity(b.sequenceActivity).isDefault = false;
-		b.sequenceActivity.orderID = sequences.length;
-		b.setDefaultSequenceName();
+		//b.sequenceActivity.orderID = sequences.length;
+		//b.setDefaultSequenceName();
 			
-		Debugger.log("sequence: " + b.sequenceActivity.activityUIID, Debugger.CRITICAL, "createActivitylessBranch", "CanvasModel");
-		Debugger.log("isDefault: " + b.sequenceActivity.isDefault, Debugger.CRITICAL, "createActivitylessBranch", "CanvasModel");
+		sequences.sortOn("orderID", Array.NUMERIC);
+		var orderID:Number = (sequences.length > 0) ? sequences[sequences.length-1].orderID : 0;
 		
-		createNewSequenceActivity(activeView.activity, sequences.length+1, null, true);
+		Debugger.log("orderID: " + orderID, Debugger.CRITICAL, "createActivitylessBranch", "CanvasModel");
 			
+		createNewSequenceActivity(activeView.activity, orderID+1, null, true);
+			
 		return b;
 	}
 
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspectorControls.as
===================================================================
diff -u -r7f6876a94e91244123c836418b11146b78c424dc -re56cc7dce08bb4a9c996c596216440807778112e
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspectorControls.as	(.../PropertyInspectorControls.as)	(revision 7f6876a94e91244123c836418b11146b78c424dc)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspectorControls.as	(.../PropertyInspectorControls.as)	(revision e56cc7dce08bb4a9c996c596216440807778112e)
@@ -1281,7 +1281,10 @@
 		else if (_canvasModel.selectedItem.activity.activityTypeID == Activity.OPTIONAL_ACTIVITY_TYPE)
 			_canvasModel.selectedItem.updateChildren();
 		else if(_canvasModel.selectedItem instanceof BranchConnector) {
-			_canvasModel.selectedItem.updateBranchLabel();
+			if(_canvasModel.selectedItem.branch.isEnd)
+				_canvasModel.branchesDisplayed.get(_canvasModel.getCanvas().ddm.getBranchesForActivityUIID(SequenceActivity(_canvasModel.selectedItem.branch.sequenceActivity).firstActivityUIID).target.branchUIID).updateBranchLabel();
+			else
+				_canvasModel.selectedItem.updateBranchLabel();
 		}
 		
 		setModified();