diff --git a/bigbluebutton-client/resources/config.xml.template b/bigbluebutton-client/resources/config.xml.template
index 1b7cc6704a..9c4d605c66 100755
--- a/bigbluebutton-client/resources/config.xml.template
+++ b/bigbluebutton-client/resources/config.xml.template
@@ -12,8 +12,8 @@
             
 		<modules>
 		 
-		<module name="ChatModule" url="http://bbbdev2.googool.com/client/ChatModule.swf?v=4105" 
-			uri="rtmp://bbbdev2.googool.com/bigbluebutton" 
+		<module name="ChatModule" url="http://HOST/client/ChatModule.swf?v=4105" 
+			uri="rtmp://HOST/bigbluebutton" 
 			dependsOn="ViewersModule"	
 			translationOn="false"
 			translationEnabled="false"	
@@ -22,31 +22,31 @@
 			baseTabIndex="701"
 		/>
 		
-		<module name="ViewersModule" url="http://bbbdev2.googool.com/client/ViewersModule.swf?v=4105" 
-			uri="rtmp://bbbdev2.googool.com/bigbluebutton" 
-			host="http://bbbdev2.googool.com/bigbluebutton/api/enter"
+		<module name="ViewersModule" url="http://HOST/client/ViewersModule.swf?v=4105" 
+			uri="rtmp://HOST/bigbluebutton" 
+			host="http://HOST/bigbluebutton/api/enter"
 			allowKickUser="false"
 			windowVisible="true"
 			baseTabIndex="201"
 		/>
 			
-		<module name="ListenersModule" url="http://bbbdev2.googool.com/client/ListenersModule.swf?v=4105" 
-			uri="rtmp://bbbdev2.googool.com/bigbluebutton" 
-			recordingHost="http://bbbdev2.googool.com"
+		<module name="ListenersModule" url="http://HOST/client/ListenersModule.swf?v=4105" 
+			uri="rtmp://HOST/bigbluebutton" 
+			recordingHost="http://HOST"
 			windowVisible="true"
 			position="bottom-left"
 			baseTabIndex="301"
 		/>
 		
 		<module name="DeskShareModule" 
-			url="http://bbbdev2.googool.com/client/DeskShareModule.swf?v=4105" 
-			uri="rtmp://bbbdev2.googool.com/deskShare"
+			url="http://HOST/client/DeskShareModule.swf?v=4105" 
+			uri="rtmp://HOST/deskShare"
 			autoStart="false"
 			baseTabIndex="101"
 		/>
 		
-		<module name="PhoneModule" url="http://bbbdev2.googool.com/client/PhoneModule.swf?v=4105" 
-			uri="rtmp://bbbdev2.googool.com/sip" 
+		<module name="PhoneModule" url="http://HOST/client/PhoneModule.swf?v=4105" 
+			uri="rtmp://HOST/sip" 
 			autoJoin="true"
 			skipCheck="false"
 			showButton="true"
@@ -54,8 +54,8 @@
 			dependsOn="ViewersModule"
 		/>
 
-		<module name="VideoconfModule" url="http://bbbdev2.googool.com/client/VideoconfModule.swf?v=4105" 
-			uri="rtmp://bbbdev2.googool.com/video"
+		<module name="VideoconfModule" url="http://HOST/client/VideoconfModule.swf?v=4105" 
+			uri="rtmp://HOST/video"
 			dependson = "ViewersModule"
 			videoQuality = "100"
 			presenterShareOnly = "false"
@@ -82,23 +82,23 @@
 			baseTabIndex="101"		
 		/>
 		
-		<module name="WhiteboardModule" url="http://bbbdev2.googool.com/client/WhiteboardModule.swf?v=4105" 
-			uri="rtmp://bbbdev2.googool.com/bigbluebutton" 
+		<module name="WhiteboardModule" url="http://HOST/client/WhiteboardModule.swf?v=4105" 
+			uri="rtmp://HOST/bigbluebutton" 
 			dependsOn="PresentModule"
 			baseTabIndex="601"
 		/>
 		
-		<module name="PresentModule" url="http://bbbdev2.googool.com/client/PresentModule.swf?v=4105" 
-			uri="rtmp://bbbdev2.googool.com/bigbluebutton" 
-			host="http://bbbdev2.googool.com" 
+		<module name="PresentModule" url="http://HOST/client/PresentModule.swf?v=4105" 
+			uri="rtmp://HOST/bigbluebutton" 
+			host="http://HOST" 
 			showPresentWindow="true"
 			showWindowControls="true"
 			dependsOn="ViewersModule"
 			baseTabIndex="501"
 		/>
 
-		<module name="VideodockModule" url="http://bbbdev2.googool.com/client/VideodockModule.swf?v=4105"
-			uri="rtmp://bbbdev2.googool.com/bigbluebutton" 
+		<module name="VideodockModule" url="http://HOST/client/VideodockModule.swf?v=4105"
+			uri="rtmp://HOST/bigbluebutton" 
 			dependsOn="VideoconfModule, ViewersModule"
 			autoDock="true"
 			maximizeWindow="false"
@@ -110,27 +110,27 @@
 			baseTabIndex="401"
 		/>
 		
-		<module name="LayoutModule" url="http://bbbdev2.googool.com/client/LayoutModule.swf?v=4105"
-			uri="rtmp://bbbdev2.googool.com/bigbluebutton"
-			layoutConfig="http://bbbdev2.googool.com/client/conf/layout.xml"
+		<module name="LayoutModule" url="http://HOST/client/LayoutModule.swf?v=4105"
+			uri="rtmp://HOST/bigbluebutton"
+			layoutConfig="http://HOST/client/conf/layout.xml"
 			enableEdit="true"
 		/>
 
 		<!-- new module in development: 
-		<module name="DynamicInfoModule" url="http://bbbdev2.googool.com/client/DynamicInfoModule.swf?v=4105" 
-			uri="rtmp://bbbdev2.googool.com/bigbluebutton" 
-			host="http://bbbdev2.googool.com" 
-			infoURL="http://bbbdev2.googool.com/client/conf/example-info-data.xml?user={userID}&role={role}&meetingID={meetingID}"
+		<module name="DynamicInfoModule" url="http://HOST/client/DynamicInfoModule.swf?v=4105" 
+			uri="rtmp://HOST/bigbluebutton" 
+			host="http://HOST" 
+			infoURL="http://HOST/client/conf/example-info-data.xml?user={userID}&role={role}&meetingID={meetingID}"
 		/>
 		-->
 		
-		<!--<module name="ExampleChatModule" url="http://bbbdev2.googool.com/client/ExampleChatModule.swf?v=56" 
-			uri="rtmp://bbbdev2.googool.com/bigbluebutton" 
-			host="http://bbbdev2.googool.com"
+		<!--<module name="ExampleChatModule" url="http://HOST/client/ExampleChatModule.swf?v=56" 
+			uri="rtmp://HOST/bigbluebutton" 
+			host="http://HOST"
 		/>-->
 		
-		<!--<module name="SharedNotesModule" url="http://bbbdev2.googool.com/client/SharedNotesModule.swf?v=4105" 
-			uri="http://bbbdev2.googool.com/bigbluebutton" 
+		<!--<module name="SharedNotesModule" url="http://HOST/client/SharedNotesModule.swf?v=4105" 
+			uri="http://HOST/bigbluebutton" 
 			dependsOn="ViewersModule"
 		/>-->
 		
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatWindow.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatWindow.mxml
index 2479cbbf9a..4aaa754bab 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatWindow.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatWindow.mxml
@@ -59,7 +59,7 @@
 			[Bindable] public var chatOptions:ChatOptions;
 			
 			[Bindable] private var baseIndex:int;
-			private function init(){
+			private function init():void{
 				baseIndex = chatOptions.baseTabIndex;
 			}
 			
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/listeners/model/ListenerOptions.as b/bigbluebutton-client/src/org/bigbluebutton/modules/listeners/model/ListenerOptions.as
index 0143da1978..1737cb91cd 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/listeners/model/ListenerOptions.as
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/listeners/model/ListenerOptions.as
@@ -12,6 +12,7 @@ package org.bigbluebutton.modules.listeners.model
 		{
 			var vxml:XML = BBB.getConfigForModule("ListenersModule");
 			if (vxml != null) {
+				windowVisible = (vxml.@windowVisible.toString().toUpperCase() == "TRUE") ? true : false;
 				if (vxml.@position != undefined) {
 					position = vxml.@position.toString();
 				}
@@ -21,7 +22,6 @@ package org.bigbluebutton.modules.listeners.model
 				else{
 					baseTabIndex = 201;
 				}
-				windowVisible = (vxml.@windowVisible.toString().toUpperCase() == "TRUE") ? true : false;
 			}
 			
 		}
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/listeners/views/ListenerItem.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/listeners/views/ListenerItem.mxml
index d6d81d4f84..006b08cdb5 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/listeners/views/ListenerItem.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/listeners/views/ListenerItem.mxml
@@ -29,7 +29,8 @@
 			import flash.events.MouseEvent;			
 			import mx.controls.Image;
 			import mx.controls.Label;
-			import mx.controls.TileList;			
+			import mx.controls.TileList;
+			import org.bigbluebutton.common.LogUtil;			
 			import org.bigbluebutton.common.Images;
 			import org.bigbluebutton.modules.listeners.events.ListenersCommand;
 			import org.bigbluebutton.util.i18n.ResourceUtil; 
@@ -85,6 +86,7 @@
 			}
 			
 			private function onCreationComplete():void {
+				LogUtil.debug("WATERFALL Entering OCC for ListenerItem");
 				if ((data != null) && data.moderator) muteCB.visible = true;		
 				else muteCB.visible = false;
 				
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/listeners/views/ListenersWindow.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/listeners/views/ListenersWindow.mxml
index 9e1d873cf1..98be8b2cde 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/listeners/views/ListenersWindow.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/listeners/views/ListenersWindow.mxml
@@ -50,6 +50,7 @@
 			import mx.controls.Label;
 			import mx.events.ListEvent;
 			import mx.messaging.channels.AMFChannel;
+			import org.bigbluebutton.common.LogUtil;
 			
 			import org.bigbluebutton.common.Images;
 			import org.bigbluebutton.common.events.LocaleChangeEvent;
@@ -85,6 +86,7 @@
 				BindingUtils.bindSetter(updateShowPushToTalkBtn, UserManager.getInstance().getConference(), "voiceLocked");
 				BindingUtils.bindSetter(updateShowPushToTalkBtn, UserManager.getInstance().getConference(), "voiceJoined");
 				this.visible = listenerOptions.windowVisible;	
+				LogUtil.debug("WATERFALL this.visible is " + this.visible.toString());
 				
 				titleBarOverlay.tabIndex = baseIndex;
 				minimizeBtn.tabIndex = baseIndex+1;
@@ -92,6 +94,11 @@
 				closeBtn.tabIndex = baseIndex+3;	
 				
 				resourcesChanged();
+				
+				LogUtil.debug("WATERFALL Trying to access parts of listenersList");
+				LogUtil.debug(listenersList.id);
+				LogUtil.debug(listenersList.visible.toString());
+				LogUtil.debug(listenersList.enabled.toString());
 			}
 			
 			private function updateShowPushToTalkBtn(show:Boolean):void {