Index: lams_central/web/lams_authoring.swf
===================================================================
diff -u -re56cc7dce08bb4a9c996c596216440807778112e -r031262744a76013a5fc13b63c4b42acb28db04fc
Binary files differ
Index: lams_central/web/lams_authoring_library.swf
===================================================================
diff -u -re56cc7dce08bb4a9c996c596216440807778112e -r031262744a76013a5fc13b63c4b42acb28db04fc
Binary files differ
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspector.as
===================================================================
diff -u -rb27ab92e1b9008cb415e099cd7ecb2eacb7c0695 -r031262744a76013a5fc13b63c4b42acb28db04fc
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspector.as	(.../PropertyInspector.as)	(revision b27ab92e1b9008cb415e099cd7ecb2eacb7c0695)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspector.as	(.../PropertyInspector.as)	(revision 031262744a76013a5fc13b63c4b42acb28db04fc)
@@ -336,7 +336,7 @@
 				populateGroupingProperties(GroupingActivity(a));
 				showAppliedGroupingProperties(a);
 			
-			} else if(a.isOptionalActivity()) {
+			} else if(a.isOptionalActivity() || a.isOptionsWithSequencesActivity()) {
 				
 				showGeneralControls(true, !a.readOnly);
 				showGroupingControls(false);
@@ -525,9 +525,9 @@
 	}
 	
 	private function showOptionalActivityProperties(ca:ComplexActivity){
-		if(ca.isSequenceBased) showOptionalSequenceActivityProperties(ca);
+		if(ca.isOptionsWithSequencesActivity()) showOptionalSequenceActivityProperties(ca);
 	
-		toolDisplayName_lbl.text = (!ca.isSequenceBased) ? "<b>"+Dictionary.getValue('pi_title')+"</b> - "+Dictionary.getValue('pi_optional_title')
+		toolDisplayName_lbl.text = (!ca.isOptionsWithSequencesActivity()) ? "<b>"+Dictionary.getValue('pi_title')+"</b> - "+Dictionary.getValue('pi_optional_title')
 														: toolDisplayName_lbl.text = "<b>"+Dictionary.getValue('pi_title')+"</b> - "+Dictionary.getValue('opt_activity_seq_title');
 		
 		runOffline_chk.selected = ca.runOffline;
@@ -549,11 +549,6 @@
 	}
 	
 	private function showOptionalSequenceActivityProperties(ca:ComplexActivity){
-		//toolDisplayName_lbl.text = "<b>"+Dictionary.getValue('pi_title')+"</b> - "+Dictionary.getValue('opt_activity_seq_title');
-		
-		//runOffline_chk.selected = ca.runOffline;
-		//defineLater_chk.selected = ca.defineLater;
-		
 		if(ca.noSequences == undefined)
 			noSeqAct_cmb.selectedIndex = 0;
 		else
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspectorControls.as
===================================================================
diff -u -re56cc7dce08bb4a9c996c596216440807778112e -r031262744a76013a5fc13b63c4b42acb28db04fc
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspectorControls.as	(.../PropertyInspectorControls.as)	(revision e56cc7dce08bb4a9c996c596216440807778112e)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspectorControls.as	(.../PropertyInspectorControls.as)	(revision 031262744a76013a5fc13b63c4b42acb28db04fc)
@@ -328,8 +328,8 @@
 			minAct_stp.enabled = true;
 			maxAct_stp.enabled = true;
 		}
-			
-		if(CanvasOptionalActivity(_canvasModel.selectedItem).type == CanvasOptionalActivity.SEQ_TYPE) {
+		
+		if(_canvasModel.selectedItem.activity.isOptionsWithSequencesActivity()) {
 			if(e != null)
 				noSeqAct_cmb.enabled = e;
 			else
Index: lams_flash/src/common/flash/org/lamsfoundation/lams/common/ApplicationParent.as
===================================================================
diff -u -r15c52eea1969487084a796934d831c4d00df17db -r031262744a76013a5fc13b63c4b42acb28db04fc
--- lams_flash/src/common/flash/org/lamsfoundation/lams/common/ApplicationParent.as	(.../ApplicationParent.as)	(revision 15c52eea1969487084a796934d831c4d00df17db)
+++ lams_flash/src/common/flash/org/lamsfoundation/lams/common/ApplicationParent.as	(.../ApplicationParent.as)	(revision 031262744a76013a5fc13b63c4b42acb28db04fc)
@@ -153,12 +153,10 @@
 		
     }
 	
-	public function addLocaleToURL(url:String):String {
+	public static function addLocaleToURL(url:String):String {
 		var locale:String = (_root.lang == "en") ? "" : _root.lang;
 		var newURL:String;
-		Debugger.log("ends with /: " + url.substr(url.length-1, url.length) == "/", Debugger.CRITICAL, "addLocaleToURL", "ApplicationPArent");
-		Debugger.log("str: " +url.substr(url.length-1, url.length), Debugger.CRITICAL, "addLocaleToURL", "ApplicationPArent");
-		Debugger.log("str 2: " + url.substr(0, url.length-1), Debugger.CRITICAL, "addLocaleToURL", "ApplicationPArent");
+		
 		if(url.substr(url.length-1, url.length) == "/") {
 			newURL = url.substr(0, url.length-1) + locale + "/";
 		} else {
@@ -174,6 +172,7 @@
 	 */
 	public function getHelpURL(callback:Function) {
 		var _callback:Function = callback;
+		
 		if(callback == null || callback == undefined) {
 			_callback = Proxy.create(this, openHelp);	// default callback
 		} else {