Index: lams_central/web/lams_authoring.swf
===================================================================
diff -u -r15c52eea1969487084a796934d831c4d00df17db -r7f6876a94e91244123c836418b11146b78c424dc
Binary files differ
Index: lams_central/web/lams_authoring_library.swf
===================================================================
diff -u -r15c52eea1969487084a796934d831c4d00df17db -r7f6876a94e91244123c836418b11146b78c424dc
Binary files differ
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as
===================================================================
diff -u -r745cc845b7776b062471723072abb234db21f292 -r7f6876a94e91244123c836418b11146b78c424dc
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as	(.../CanvasModel.as)	(revision 745cc845b7776b062471723072abb234db21f292)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as	(.../CanvasModel.as)	(revision 7f6876a94e91244123c836418b11146b78c424dc)
@@ -880,12 +880,16 @@
 			return new LFError("Cannot add more than one Activityless branch.", null);
 		
 		var b:Branch = new Branch(_cv.ddm.newUIID(), BranchConnector.DIR_SINGLE, activeView.startHub.activity.activityUIID,  null, activeView.defaultSequenceActivity, _cv.ddm.learningDesignID);
-		SequenceActivity(b.sequenceActivity).isDefault = false;
+		var sequences:Array = _cv.ddm.getComplexActivityChildren(b.sequenceActivity.parentUIID);
 		
+		SequenceActivity(b.sequenceActivity).isDefault = false;
+		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");
 		
-		createNewSequenceActivity(activeView.activity, b.sequenceActivity.orderID+1, null, true);
+		createNewSequenceActivity(activeView.activity, sequences.length+1, null, true);
 			
 		return b;
 	}
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspectorControls.as
===================================================================
diff -u -raf37dfbc73134445fa352a539763fc78db5def1d -r7f6876a94e91244123c836418b11146b78c424dc
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspectorControls.as	(.../PropertyInspectorControls.as)	(revision af37dfbc73134445fa352a539763fc78db5def1d)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspectorControls.as	(.../PropertyInspectorControls.as)	(revision 7f6876a94e91244123c836418b11146b78c424dc)
@@ -1015,8 +1015,14 @@
 	}
 	
 	private function hasConnectedSequences(s:Array):Boolean {
-		for(var i=0; i<s.length; i++)
-			if(SequenceActivity(s[i]).firstActivityUIID != null) return true;
+		for(var i=0; i<s.length; i++) {
+			var seqAct:SequenceActivity = SequenceActivity(s[i]);
+			
+			if(seqAct.firstActivityUIID != null)
+				return true;
+			else if(seqAct.empty && !seqAct.isDefault)
+				return true;
+		}
 		
 		return false;
 	}
@@ -1029,6 +1035,8 @@
 		
 		var sequences:Array = _canvasModel.getCanvas().ddm.getComplexActivityChildren(_canvasModel.selectedItem.activity.activityUIID);
 		
+		Debugger.log("has connected seq: " + hasConnectedSequences(sequences), Debugger.CRITICAL, "showToolBasedBranchingControls", "PIC*");
+		
 		if(hasConnectedSequences(sequences)) {
 			if(_canvasModel.selectedItem.activity.toolActivityUIID != null) {
 				_tool_output_match_btn.visible = v;
@@ -1191,9 +1199,16 @@
 	}
 	
 	private function getValidBranches(branches:Array):Array {
-		for(var i=0; i < branches.length; i++) {
-			if(branches[i].direction != BranchConnector.DIR_FROM_START)
+		Debugger.log("validating br len: " + branches.length, Debugger.CRITICAL, "getvalidbranches", "PIC*");
+		
+		for(var i=0; i < branches.length; i++) {
+			Debugger.log("validating br: " + branches[i].sequenceActivity.title, Debugger.CRITICAL, "getvalidbranches", "PIC*");
+			Debugger.log("validating br dir: " + branches[i].direction, Debugger.CRITICAL, "getvalidbranches", "PIC*");
+			
+			if(branches[i].direction != BranchConnector.DIR_FROM_START && branches[i].direction != BranchConnector.DIR_SINGLE) {
 				branches.splice(i, 1);
+				i=i-1;
+			}
 		}
 		
 		return branches;