diff --git a/AcmeWidgetFactory/src/org/robotlegs/demos/acmewidgetfactory/shell/model/ActiveWidgetModel.as b/AcmeWidgetFactory/src/org/robotlegs/demos/acmewidgetfactory/shell/model/ActiveWidgetModel.as
index bf3c0ed..6cbb456 100644
--- a/AcmeWidgetFactory/src/org/robotlegs/demos/acmewidgetfactory/shell/model/ActiveWidgetModel.as
+++ b/AcmeWidgetFactory/src/org/robotlegs/demos/acmewidgetfactory/shell/model/ActiveWidgetModel.as
@@ -7,10 +7,10 @@ package org.robotlegs.demos.acmewidgetfactory.shell.model
 	import mx.modules.ModuleManager;
 	
 	import org.robotlegs.demos.acmewidgetfactory.common.interfaces.IWidgetModule;
-	import org.robotlegs.mvcs.Model;
+	import org.robotlegs.mvcs.Actor;
 	import org.robotlegs.utils.NamedObjectMap;
 	
-	public class ActiveWidgetModel extends Model
+	public class ActiveWidgetModel extends Actor
 	{
 		private static const MODULE_URL:String = 'org/robotlegs/demos/acmewidgetfactory/modules/widget/WidgetModule.swf';
 		
diff --git a/FlickrImageGallery/src/org/robotlegs/demos/imagegallery/models/GalleryModel.as b/FlickrImageGallery/src/org/robotlegs/demos/imagegallery/models/GalleryModel.as
index 4797548..6d8581e 100644
--- a/FlickrImageGallery/src/org/robotlegs/demos/imagegallery/models/GalleryModel.as
+++ b/FlickrImageGallery/src/org/robotlegs/demos/imagegallery/models/GalleryModel.as
@@ -15,7 +15,7 @@ package org.robotlegs.demos.imagegallery.models
 	import org.robotlegs.demos.imagegallery.models.vo.GalleryImage;
 	import org.robotlegs.mvcs.*;
 
-	public class GalleryModel extends Model
+	public class GalleryModel extends Actor
 	{
 		private var _gallery:Gallery;
 		
diff --git a/FlickrImageGallery/src/org/robotlegs/demos/imagegallery/remote/services/FlickrImageService.as b/FlickrImageGallery/src/org/robotlegs/demos/imagegallery/remote/services/FlickrImageService.as
index 0bb8fb3..9fbcc7f 100644
--- a/FlickrImageGallery/src/org/robotlegs/demos/imagegallery/remote/services/FlickrImageService.as
+++ b/FlickrImageGallery/src/org/robotlegs/demos/imagegallery/remote/services/FlickrImageService.as
@@ -20,9 +20,9 @@ package org.robotlegs.demos.imagegallery.remote.services
 	import org.robotlegs.demos.imagegallery.events.GalleryEvent;
 	import org.robotlegs.demos.imagegallery.models.vo.Gallery;
 	import org.robotlegs.demos.imagegallery.models.vo.GalleryImage;
-	import org.robotlegs.mvcs.Service;
+	import org.robotlegs.mvcs.Actor;
 
-	public class FlickrImageService extends Service implements IGalleryImageService
+	public class FlickrImageService extends Actor implements IGalleryImageService
 	{
 		private var service:FlickrService;
 		private var photos:Photos;
diff --git a/GoogleMaps/src/org/robotlegs/demos/flashgooglemaps/model/proxies/AssetLoaderProxy.as b/GoogleMaps/src/org/robotlegs/demos/flashgooglemaps/model/proxies/AssetLoaderProxy.as
index 216ad92..42f84e0 100644
--- a/GoogleMaps/src/org/robotlegs/demos/flashgooglemaps/model/proxies/AssetLoaderProxy.as
+++ b/GoogleMaps/src/org/robotlegs/demos/flashgooglemaps/model/proxies/AssetLoaderProxy.as
@@ -27,7 +27,7 @@ package org.robotlegs.demos.flashgooglemaps.model.proxies
 	import flash.net.URLRequest;
 	
 	import org.robotlegs.demos.flashgooglemaps.model.events.AssetLoaderProxyEvent;
-	import org.robotlegs.mvcs.Model;
+	import org.robotlegs.mvcs.Actor;
 	
 	/**
 	 * Proxy to load the xml content.
@@ -35,7 +35,7 @@ package org.robotlegs.demos.flashgooglemaps.model.proxies
 	 * @author Peter Lorent peter.lorent@gmail.com
 	 * 
 	 */	
-	public class AssetLoaderProxy extends Model
+	public class AssetLoaderProxy extends Actor
 	{
 		//--------------------------------------------------------------------------
 		//
diff --git a/GoogleMaps/src/org/robotlegs/demos/flashgooglemaps/model/services/GeoCodingService.as b/GoogleMaps/src/org/robotlegs/demos/flashgooglemaps/model/services/GeoCodingService.as
index d787788..51cb612 100644
--- a/GoogleMaps/src/org/robotlegs/demos/flashgooglemaps/model/services/GeoCodingService.as
+++ b/GoogleMaps/src/org/robotlegs/demos/flashgooglemaps/model/services/GeoCodingService.as
@@ -22,12 +22,11 @@
 
 package org.robotlegs.demos.flashgooglemaps.model.services
 {
-	import org.robotlegs.mvcs.Service;
-	import org.robotlegs.demos.flashgooglemaps.model.events.GeoCodingServiceEvent;
-	
 	import com.google.maps.services.ClientGeocoder;
 	import com.google.maps.services.GeocodingEvent;
-	import com.google.maps.LatLng;
+	
+	import org.robotlegs.demos.flashgooglemaps.model.events.GeoCodingServiceEvent;
+	import org.robotlegs.mvcs.Actor;
 	
 	/**
 	 * A Service to get us some results from the Googlemaps API.
@@ -35,7 +34,7 @@ package org.robotlegs.demos.flashgooglemaps.model.services
 	 * @author Peter Lorent peter.lorent@gmail.com
 	 * 
 	 */	
-	public class GeoCodingService extends Service
+	public class GeoCodingService extends Actor
 	{
 		//--------------------------------------------------------------------------
 		//
diff --git a/GoogleMaps/web/FlashGoogleMaps.html b/GoogleMaps/web/FlashGoogleMaps.html
index 32500f1..c28c292 100644
--- a/GoogleMaps/web/FlashGoogleMaps.html
+++ b/GoogleMaps/web/FlashGoogleMaps.html
@@ -12,7 +12,7 @@
     // -->
     <head>
         <title></title>         
-        <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+        <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 		<!-- Include CSS to eliminate any default margins/padding and set the height of the html element and 
 		     the body element to 100%, because Firefox, or any Gecko based browser, interprets percentage as 
 			 the percentage of the height of its parent container, which has to be set explicitly.  Initially, 
@@ -20,7 +20,8 @@
 		-->
         <style type="text/css" media="screen"> 
 			html, body	{ height:100%; }
-			body { margin:0; padding:0; overflow:auto; text-align:center; }   
+			body { margin:0; padding:0; overflow:auto; text-align:center; 
+			       background-color: #ffffff; }   
 			#flashContent { display:none; }
         </style>
 		
@@ -65,9 +66,11 @@
 	        	To view this page ensure that Adobe Flash Player version 
 				10.0.0 or greater is installed. 
 			</p>
-			<a href="http://www.adobe.com/go/getflashplayer">
-				<img src="http://www.adobe.com/images/shared/download_buttons/get_flash_player.gif" alt="Get Adobe Flash Player" />
-			</a>
+			<script type="text/javascript"> 
+				var pageHost = ((document.location.protocol == "https:") ? "https://" :	"http://"); 
+				document.write("<a href='http://www.adobe.com/go/getflashplayer'><img src='" 
+								+ pageHost + "www.adobe.com/images/shared/download_buttons/get_flash_player.gif' alt='Get Adobe Flash player' /></a>" ); 
+			</script> 
         </div>
 	   	
        	<noscript>
@@ -77,25 +80,25 @@
                 <param name="bgcolor" value="#ffffff" />
                 <param name="allowScriptAccess" value="sameDomain" />
                 <param name="allowFullScreen" value="true" />
-                <!--[if !IE]>
+                <!--[if !IE]>-->
                 <object type="application/x-shockwave-flash" data="FlashGoogleMaps.swf" width="100%" height="100%">
                     <param name="quality" value="high" />
                     <param name="bgcolor" value="#ffffff" />
                     <param name="allowScriptAccess" value="sameDomain" />
                     <param name="allowFullScreen" value="true" />
-                <![endif]-->
-                <!--[if gte IE 6]>
+                <!--<![endif]-->
+                <!--[if gte IE 6]>-->
                 	<p> 
                 		Either scripts and active content are not permitted to run or Adobe Flash Player version
                 		10.0.0 or greater is not installed.
                 	</p>
-                <![endif]-->
+                <!--<![endif]-->
                     <a href="http://www.adobe.com/go/getflashplayer">
                         <img src="http://www.adobe.com/images/shared/download_buttons/get_flash_player.gif" alt="Get Adobe Flash Player" />
                     </a>
-                <!--[if !IE]>
+                <!--[if !IE]>-->
                 </object>
-                <![endif]-->
+                <!--<![endif]-->
             </object>
 	    </noscript>		
    </body>
diff --git a/GoogleMaps/web/FlashGoogleMaps.swf b/GoogleMaps/web/FlashGoogleMaps.swf
index de2735b..486047b 100644
Binary files a/GoogleMaps/web/FlashGoogleMaps.swf and b/GoogleMaps/web/FlashGoogleMaps.swf differ
diff --git a/GoogleMaps/web/assets/img/jos.jpg b/GoogleMaps/web/assets/img/jos.jpg
new file mode 100644
index 0000000..81e9791
Binary files /dev/null and b/GoogleMaps/web/assets/img/jos.jpg differ
diff --git a/GoogleMaps/web/assets/img/wild.jpg b/GoogleMaps/web/assets/img/wild.jpg
new file mode 100644
index 0000000..6098e33
Binary files /dev/null and b/GoogleMaps/web/assets/img/wild.jpg differ
diff --git a/GoogleMaps/web/assets/xml/content.xml b/GoogleMaps/web/assets/xml/content.xml
new file mode 100644
index 0000000..636572e
--- /dev/null
+++ b/GoogleMaps/web/assets/xml/content.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<website>
+	<markers>
+		<marker headline="In de Wildeman, a famous beerpub" foto="wild.jpg" body="Situated in a former Amsterdam distillery, In de Wildeman offers an ideal opportunity to enjoy your beer in an authentic environment." lat="52.3761799" lng="4.8952004" stad="Amsterdam" adres="Kolksteeg 3"/>
+		<marker headline="Café Jos Meesterschenkerij" foto="jos.jpg" body="This pub is the 2009 number 1 pub in The Netherlands according to the official pub top 100! Be sure to visit this one." lat="51.8359761" lng="5.8781757" stad="Nijmegen" adres="Daalseweg 309"/>
+	</markers>
+	<contents>
+		<content type="how"><![CDATA[<font color='#b30d0d' size='21'>So, let's try and explain how everything works here.</font><br/><br/><font size='15px'>Remember, on github.com/darscan/robotlegs/tree/master you can read more about the framework.<br/><br/><span class='mbold'>First things first.</span><br/>The project is a FlashBuilder AS3-project using SDK4.0.0 build 7219. It is set to build in /web/assets/swf/ and opens the index.html in /web if you debug the project. The index.html embeds a loader.swf and it loads the swf we compile with FlashBuilder. The View (component) classes in the code embed graphical assets (movieclips) from fla files (Flash CS4). These are set to publish in src/main/flash/assets/swf/. If you change things in the fla's, compile in the Flash IDE and debug the project in FlashBuilder to see the changes. The Googlemap uses a custom marker. Its View class embeds a .png that resides in src/main/flash/assets/bitmaps/. One thing to mention: I used the word component. No, I don't mean a full fledged AS3 Component. In the context of the framework we merely use the word component to make a distinction between the Mediator and the view component it mediates.<br/><br/>The basic idea is to show how the framework is used to consume content like xml and a service. And (of course) how to set and change the state using events. On the Googlemap I show some pubs in our country with corresponding entries under the 'Tips' tab in the main navigation. Clicking on one of the markers triggers an event in the View component and its Mediator handles the event by calling the (Googlemaps API) service. The Mediator receives the result from the service and changes the state of the View component via its API. To demonstrate how to 'communicate' between the main content pane and the Googlemap (these two 'components' are obviously unaware of each other) the tips will 'trigger' an event when clicked and cause the Googlemap to change its state.<br/><br/>Within the main content pane the main navigation is a seperate component. It merely triggers an event when one of the tabs is clicked. The event carries an id and the Mediator that 'governs' the content view component uses this id to show the correct content from the xml.<br/><br/>Ok, that pretty much wraps it up. Last thing to mention: this is a work in progress so I'll probably refactor some things, so check back if you want to have the latest version. And now:</font><br/><br/><span class='link'><a href='event:showTips'>Show me the best pubs >></a></span>]]></content>
+		<content type="tips">
+			<tip text="Tip 1. Amsterdam - In de Wildeman, a famous pub with a nice collection of Belgian beers"/>
+			<tip text="Tip 2. Nijmegen - Café Jos. This pub is the number 1 pub on the hotlist!"/>
+		</content>
+		<content type="how"><![CDATA[<font color='#b30d0d' size='21'>Some words on how the code works.</font><br/><br/><br/><font size='15px'>Everything is a choice, right? I've just made some choices in the design to show how the framework does its job. For instance, in this demo I'm waiting for the Googlemap to broadcast its MapEvent.MAP_READY event before anything happens on the stage - see GoogleMapsView.handleEvent(). Only after that event fires, I'm loading the xml that contains the data for the markers, parse that data and animate the map to a position on the stage. 'onComplete' the main content pane moves to its final destination. It's only to show how to use the events from the framework to orchestrate what happens on the stage. So yes, if that MapEvent.MAP_READY doesn't fire, nothing will happen. In a real life website you would need to catch this and show some error message. Or opt for a different implementation all together for that matter.<br/><br/><span class='mbold'>Now, from the top.</span><br/>Ok, to get things working the framework requires some basic actors. One of the - in my opinion - nifty features of RobotLegs is that it 'listens' to what happens on the display list (later more on this). So the first thing you must provide is the container that holds all Sprites and Movieclips you want to put on the stage - see  <span class='mbold'>FlashGoogleMaps.as</span> which is the 'Document class' of the project. You pass this information to what is known as the Context - see  <span class='mbold'>FlashGoogleMapsContext.as.</span> The Context will initialize the framework. Next, you need to provide some information about your actors. Basically you map View components to their Mediators, map Commands to events (so things will happen when you want to) and... well, let's say save some stuff you can use later on in the code ('ask for' - for instance - Proxies and/or Services using the magic called Dependency Injection). When all of that is done, you fire a  <span class='mbold'>ContextEvent.STARTUP</span> and... nothing happens. Here is where it starts to get interesting. Only when you add a Sprite to the display list, that is when things start happening. The framework detects the new child on the stage, provides the correct mediator and away we go. And once you are coding in RobotLegs you will experience why this is so freaking cool. Let's summarize the basic actors in this demo:<br/><br/>FlashGoogleMaps.as - serves as the Document Class<br/>FlashGoogleMapsContext.as - initializes the framework<br/>PrepViewCommand.as - map View components to Mediators<br/>PrepModelCommand.as - 'save' the model parts we will need<br/>PrepControllerCommand - map some Commands to events<br/>StartupCommand.as - add some Sprites to fire up this thing.<br/><br/><span class='mbold'>The Views and Mediators.</span><br/>Ok, with the basic actors in place we can add our Views and do something with the Model. As said, I'm dropping a GoogleMapsView on the stage. The framework detects this action and automatically provides the GoogleMapsMediator thanks to the mapping we did. Have a look at the GoogleMapsMediator. It listens for the GoogleMapsView.GOOGLEMAP_READY event fired by the GoogleMapsView. Once that events fires, handleGoogleMapReady() gets called and that's when I load the xml-file that contains the data for the markers and all other content. To load the xml (a Model related job) we dispatch an event that is mapped to the LoadXMLCommand. The GoogleMapsMediator obviously wants to know when the xml is loaded so it registers for AssetLoaderProxyEvent.XML_CONTENT_LOADED which will be fired by AssetLoaderProxy. Once the event fires handleXMLContentLoaded() modifies GoogleMapsView via its API. And that - basically - is it!<br/><br/>Ok, that was way more than 'some words', but you have to agree it's easy stuff and all you need to know to start coding with RobotLegs. Yes, there is more but once you are on your way you will discover and learn the more involved aspects of the framework.</font>]]></content>
+		<content type="how"><![CDATA[<font color='#b30d0d' size='21'>How about the nitty gritty?</font><br>
+<font size='15px'>We have the basics covered and the purpose of this demo is to show just how easy it is to work with RobotLegs, but maybe I should explain some design choices in the code.<br/><br/><span class='mbold'>The Mediators.</span><br/>I could have done the demo with three Mediators:<br/><br/>GoogleMapsMediator, ContentViewMediator, TabViewMediator, mediating the three 'major' views in the demo.<br/><br/>In this setup the ContentView, representing the content pane, could listen to events from its view parts (PlainTextView and TipView(s)) and let the ContentMediator handle those events. Let's look at the tips. What we need here is that a click on the tip makes the Googlemap zoom in on the location and show the lay over with some information on the selected pub. The ContentView must listen for the event from the TipView(s) and let its Mediator know about this so the framework can notify the GoogleMapsMediator of the request. Let's say this works but it clutters the code in the ContentView. In comes that nifty feature again where RobotLegs detects new children on the stage. The moment the ContentView adds TipView(s) to the display list, RobotLegs makes sure there is a Mediator (provided we did the mapping!). This makes sense right? The dynamically created TipViewMediators now handle the click event and 'directly' inform the GooglemapsMediator. And yes, if we remove a child, RobotLegs removes the associated Mediator for us.<br/><br/>So, what about a Mediator for the SmartInfoWindow? I'll leave that up to you if you don't mind.<br/><br/><span class='mbold'>The content.</span><br/>There are so many ways to parse, save and distribute the (xml) content and it is beyond the scope of this demo to discuss this. I decided to use VO's for the markers on the Googlemap because this makes it much easier to work with (this is pretty much the way I would handle a result from a remoting gateway). Yes, you can also skip the VO stuff all together and just parse the tips in the GoogleView, or whatever approach you feel comfortable with. One thing to note on my VO approach: it is not really the Mediator way of doing things. You should be able to (re)use the view component as is in another project. Meaning, using its API, provide it with data and be done with it. The dependency on the VO's prevents this. Just so you know.<br/><br/><span class='mbold'>The events.</span><br/>I can hear you thinking, 'do we need all these events'? Technically, no. You could do with a generic event that can carry optional data. Downside: it means casting stuff all over the place and that's one of the things RobotLegs is not promoting. Bottom line: it's a matter of choice.<br/><br/><span class='mbold'>Final words.</span><br/>Found any flaws in the code? You know a better way to do things? Let me know. Join the RobotLegs AS3 Discussion Group, http://groups.google.com/group/robotlegs, and drop a message.<br/>I hope this demo helped you to get going with RobotLegs in a Flash AS3 environment. And I wish you happy coding!</font>]]></content>
+	</contents>
+</website>
diff --git a/GoogleMaps/web/index.html b/GoogleMaps/web/index.html
index 14985d8..f497c1a 100644
--- a/GoogleMaps/web/index.html
+++ b/GoogleMaps/web/index.html
@@ -16,11 +16,11 @@
         <meta name="author" content="" />
         <meta name="formatter" content="" />
 
-        <link rel="stylesheet" type="text/css" href="./assets/css/flash.css" />
-        <link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" />
+        <link rel="stylesheet" type="text/css" href="assets/css/flash.css" />
+        <link rel="shortcut icon" href="favicon.ico" type="image/x-icon" />
 
         <!-- Configuration -->
-        <script type="text/javascript" src="./assets/js/swfobject.js"></script>
+        <script type="text/javascript" src="assets/js/swfobject.js"></script>
 
     </head>
     <body class="fullscreen">
@@ -34,9 +34,9 @@ <h1></h1>
         <script type="text/javascript">
         // <![CDATA[
         swfobject.embedSWF(
-            "./loader.swf", "flash_container",
+            "loader.swf", "flash_container",
             "100%", "100%",
-            "10.0.0.0","./assets/swf/expressinstall.swf",
+            "10.0.0.0","assets/swf/expressinstall.swf",
                         {},   // flashvars
                         {scale:"noscale"},   // params
                         {},   // attributes
diff --git a/GoogleMaps/web/swfobject.js b/GoogleMaps/web/swfobject.js
index d182dc9..9378c8f 100644
--- a/GoogleMaps/web/swfobject.js
+++ b/GoogleMaps/web/swfobject.js
@@ -1,6 +1,5 @@
-/*! SWFObject v2.1 <http://code.google.com/p/swfobject/>
-	Copyright (c) 2007-2008 Geoff Stearns, Michael Williams, and Bobby van der Sluis
-	This software is released under the MIT License <http://www.opensource.org/licenses/mit-license.php>
+/*!	SWFObject v2.2 <http://code.google.com/p/swfobject/> 
+	is released under the MIT License <http://www.opensource.org/licenses/mit-license.php> 
 */
 
 var swfobject = function() {
@@ -11,145 +10,126 @@ var swfobject = function() {
 		SHOCKWAVE_FLASH_AX = "ShockwaveFlash.ShockwaveFlash",
 		FLASH_MIME_TYPE = "application/x-shockwave-flash",
 		EXPRESS_INSTALL_ID = "SWFObjectExprInst",
+		ON_READY_STATE_CHANGE = "onreadystatechange",
 		
 		win = window,
 		doc = document,
 		nav = navigator,
 		
-		domLoadFnArr = [],
+		plugin = false,
+		domLoadFnArr = [main],
 		regObjArr = [],
 		objIdArr = [],
 		listenersArr = [],
-		script,
-		timer = null,
-		storedAltContent = null,
-		storedAltContentId = null,
+		storedAltContent,
+		storedAltContentId,
+		storedCallbackFn,
+		storedCallbackObj,
 		isDomLoaded = false,
-		isExpressInstallActive = false;
+		isExpressInstallActive = false,
+		dynamicStylesheet,
+		dynamicStylesheetMedia,
+		autoHideShow = true,
 	
 	/* Centralized function for browser feature detection
-		- Proprietary feature detection (conditional compiling) is used to detect Internet Explorer's features
-		- User agent string detection is only used when no alternative is possible
+		- User agent string detection is only used when no good alternative is possible
 		- Is executed directly for optimal performance
 	*/	
-	var ua = function() {
+	ua = function() {
 		var w3cdom = typeof doc.getElementById != UNDEF && typeof doc.getElementsByTagName != UNDEF && typeof doc.createElement != UNDEF,
+			u = nav.userAgent.toLowerCase(),
+			p = nav.platform.toLowerCase(),
+			windows = p ? /win/.test(p) : /win/.test(u),
+			mac = p ? /mac/.test(p) : /mac/.test(u),
+			webkit = /webkit/.test(u) ? parseFloat(u.replace(/^.*webkit\/(\d+(\.\d+)?).*$/, "$1")) : false, // returns either the webkit version or false if not webkit
+			ie = !+"\v1", // feature detection based on Andrea Giammarchi's solution: http://webreflection.blogspot.com/2009/01/32-bytes-to-know-if-your-browser-is-ie.html
 			playerVersion = [0,0,0],
 			d = null;
 		if (typeof nav.plugins != UNDEF && typeof nav.plugins[SHOCKWAVE_FLASH] == OBJECT) {
 			d = nav.plugins[SHOCKWAVE_FLASH].description;
 			if (d && !(typeof nav.mimeTypes != UNDEF && nav.mimeTypes[FLASH_MIME_TYPE] && !nav.mimeTypes[FLASH_MIME_TYPE].enabledPlugin)) { // navigator.mimeTypes["application/x-shockwave-flash"].enabledPlugin indicates whether plug-ins are enabled or disabled in Safari 3+
+				plugin = true;
+				ie = false; // cascaded feature detection for Internet Explorer
 				d = d.replace(/^.*\s+(\S+\s+\S+$)/, "$1");
 				playerVersion[0] = parseInt(d.replace(/^(.*)\..*$/, "$1"), 10);
 				playerVersion[1] = parseInt(d.replace(/^.*\.(.*)\s.*$/, "$1"), 10);
-				playerVersion[2] = /r/.test(d) ? parseInt(d.replace(/^.*r(.*)$/, "$1"), 10) : 0;
+				playerVersion[2] = /[a-zA-Z]/.test(d) ? parseInt(d.replace(/^.*[a-zA-Z]+(.*)$/, "$1"), 10) : 0;
 			}
 		}
 		else if (typeof win.ActiveXObject != UNDEF) {
-			var a = null, fp6Crash = false;
 			try {
-				a = new ActiveXObject(SHOCKWAVE_FLASH_AX + ".7");
-			}
-			catch(e) {
-				try { 
-					a = new ActiveXObject(SHOCKWAVE_FLASH_AX + ".6");
-					playerVersion = [6,0,21];
-					a.AllowScriptAccess = "always";	 // Introduced in fp6.0.47
-				}
-				catch(e) {
-					if (playerVersion[0] == 6) {
-						fp6Crash = true;
-					}
-				}
-				if (!fp6Crash) {
-					try {
-						a = new ActiveXObject(SHOCKWAVE_FLASH_AX);
-					}
-					catch(e) {}
-				}
-			}
-			if (!fp6Crash && a) { // a will return null when ActiveX is disabled
-				try {
-					d = a.GetVariable("$version");	// Will crash fp6.0.21/23/29
+				var a = new ActiveXObject(SHOCKWAVE_FLASH_AX);
+				if (a) { // a will return null when ActiveX is disabled
+					d = a.GetVariable("$version");
 					if (d) {
+						ie = true; // cascaded feature detection for Internet Explorer
 						d = d.split(" ")[1].split(",");
 						playerVersion = [parseInt(d[0], 10), parseInt(d[1], 10), parseInt(d[2], 10)];
 					}
 				}
-				catch(e) {}
 			}
+			catch(e) {}
 		}
-		var u = nav.userAgent.toLowerCase(),
-			p = nav.platform.toLowerCase(),
-			webkit = /webkit/.test(u) ? parseFloat(u.replace(/^.*webkit\/(\d+(\.\d+)?).*$/, "$1")) : false, // returns either the webkit version or false if not webkit
-			ie = false,
-			windows = p ? /win/.test(p) : /win/.test(u),
-			mac = p ? /mac/.test(p) : /mac/.test(u);
-		/*@cc_on
-			ie = true;
-			@if (@_win32)
-				windows = true;
-			@elif (@_mac)
-				mac = true;
-			@end
-		@*/
-		return { w3cdom:w3cdom, pv:playerVersion, webkit:webkit, ie:ie, win:windows, mac:mac };
-	}();
-
+		return { w3:w3cdom, pv:playerVersion, wk:webkit, ie:ie, win:windows, mac:mac };
+	}(),
+	
 	/* Cross-browser onDomLoad
-		- Based on Dean Edwards' solution: http://dean.edwards.name/weblog/2006/06/again/
-		- Will fire an event as soon as the DOM of a page is loaded (supported by Gecko based browsers - like Firefox -, IE, Opera9+, Safari)
+		- Will fire an event as soon as the DOM of a web page is loaded
+		- Internet Explorer workaround based on Diego Perini's solution: http://javascript.nwbox.com/IEContentLoaded/
+		- Regular onload serves as fallback
 	*/ 
-	var onDomLoad = function() {
-		if (!ua.w3cdom) {
-			return;
+	onDomLoad = function() {
+		if (!ua.w3) { return; }
+		if ((typeof doc.readyState != UNDEF && doc.readyState == "complete") || (typeof doc.readyState == UNDEF && (doc.getElementsByTagName("body")[0] || doc.body))) { // function is fired after onload, e.g. when script is inserted dynamically 
+			callDomLoadFunctions();
 		}
-		addDomLoadEvent(main);
-		if (ua.ie && ua.win) {
-			try {	 // Avoid a possible Operation Aborted error
-				doc.write("<scr" + "ipt id=__ie_ondomload defer=true src=//:></scr" + "ipt>"); // String is split into pieces to avoid Norton AV to add code that can cause errors 
-				script = getElementById("__ie_ondomload");
-				if (script) {
-					addListener(script, "onreadystatechange", checkReadyState);
+		if (!isDomLoaded) {
+			if (typeof doc.addEventListener != UNDEF) {
+				doc.addEventListener("DOMContentLoaded", callDomLoadFunctions, false);
+			}		
+			if (ua.ie && ua.win) {
+				doc.attachEvent(ON_READY_STATE_CHANGE, function() {
+					if (doc.readyState == "complete") {
+						doc.detachEvent(ON_READY_STATE_CHANGE, arguments.callee);
+						callDomLoadFunctions();
+					}
+				});
+				if (win == top) { // if not inside an iframe
+					(function(){
+						if (isDomLoaded) { return; }
+						try {
+							doc.documentElement.doScroll("left");
+						}
+						catch(e) {
+							setTimeout(arguments.callee, 0);
+							return;
+						}
+						callDomLoadFunctions();
+					})();
 				}
 			}
-			catch(e) {}
-		}
-		if (ua.webkit && typeof doc.readyState != UNDEF) {
-			timer = setInterval(function() { if (/loaded|complete/.test(doc.readyState)) { callDomLoadFunctions(); }}, 10);
-		}
-		if (typeof doc.addEventListener != UNDEF) {
-			doc.addEventListener("DOMContentLoaded", callDomLoadFunctions, null);
+			if (ua.wk) {
+				(function(){
+					if (isDomLoaded) { return; }
+					if (!/loaded|complete/.test(doc.readyState)) {
+						setTimeout(arguments.callee, 0);
+						return;
+					}
+					callDomLoadFunctions();
+				})();
+			}
+			addLoadEvent(callDomLoadFunctions);
 		}
-		addLoadEvent(callDomLoadFunctions);
 	}();
 	
-	function checkReadyState() {
-		if (script.readyState == "complete") {
-			script.parentNode.removeChild(script);
-			callDomLoadFunctions();
-		}
-	}
-	
 	function callDomLoadFunctions() {
-		if (isDomLoaded) {
-			return;
-		}
-		if (ua.ie && ua.win) { // Test if we can really add elements to the DOM; we don't want to fire it too early
-			var s = createElement("span");
-			try { // Avoid a possible Operation Aborted error
-				var t = doc.getElementsByTagName("body")[0].appendChild(s);
-				t.parentNode.removeChild(t);
-			}
-			catch (e) {
-				return;
-			}
+		if (isDomLoaded) { return; }
+		try { // test if we can really add/remove elements to/from the DOM; we don't want to fire it too early
+			var t = doc.getElementsByTagName("body")[0].appendChild(createElement("span"));
+			t.parentNode.removeChild(t);
 		}
+		catch (e) { return; }
 		isDomLoaded = true;
-		if (timer) {
-			clearInterval(timer);
-			timer = null;
-		}
 		var dl = domLoadFnArr.length;
 		for (var i = 0; i < dl; i++) {
 			domLoadFnArr[i]();
@@ -194,109 +174,185 @@ var swfobject = function() {
 	/* Main function
 		- Will preferably execute onDomLoad, otherwise onload (as a fallback)
 	*/
-	function main() { // Static publishing only
-		var rl = regObjArr.length;
-		for (var i = 0; i < rl; i++) { // For each registered object element
-			var id = regObjArr[i].id;
-			if (ua.pv[0] > 0) {
-				var obj = getElementById(id);
-				if (obj) {
-					regObjArr[i].width = obj.getAttribute("width") ? obj.getAttribute("width") : "0";
-					regObjArr[i].height = obj.getAttribute("height") ? obj.getAttribute("height") : "0";
-					if (hasPlayerVersion(regObjArr[i].swfVersion)) { // Flash plug-in version >= Flash content version: Houston, we have a match!
-						if (ua.webkit && ua.webkit < 312) { // Older webkit engines ignore the object element's nested param elements
-							fixParams(obj);
-						}
-						setVisibility(id, true);
-					}
-					else if (regObjArr[i].expressInstall && !isExpressInstallActive && hasPlayerVersion("6.0.65") && (ua.win || ua.mac)) { // Show the Adobe Express Install dialog if set by the web page author and if supported (fp6.0.65+ on Win/Mac OS only)
-						showExpressInstall(regObjArr[i]);
-					}
-					else { // Flash plug-in and Flash content version mismatch: display alternative content instead of Flash content
-						displayAltContent(obj);
+	function main() { 
+		if (plugin) {
+			testPlayerVersion();
+		}
+		else {
+			matchVersions();
+		}
+	}
+	
+	/* Detect the Flash Player version for non-Internet Explorer browsers
+		- Detecting the plug-in version via the object element is more precise than using the plugins collection item's description:
+		  a. Both release and build numbers can be detected
+		  b. Avoid wrong descriptions by corrupt installers provided by Adobe
+		  c. Avoid wrong descriptions by multiple Flash Player entries in the plugin Array, caused by incorrect browser imports
+		- Disadvantage of this method is that it depends on the availability of the DOM, while the plugins collection is immediately available
+	*/
+	function testPlayerVersion() {
+		var b = doc.getElementsByTagName("body")[0];
+		var o = createElement(OBJECT);
+		o.setAttribute("type", FLASH_MIME_TYPE);
+		var t = b.appendChild(o);
+		if (t) {
+			var counter = 0;
+			(function(){
+				if (typeof t.GetVariable != UNDEF) {
+					var d = t.GetVariable("$version");
+					if (d) {
+						d = d.split(" ")[1].split(",");
+						ua.pv = [parseInt(d[0], 10), parseInt(d[1], 10), parseInt(d[2], 10)];
 					}
 				}
-			}
-			else {	// If no fp is installed, we let the object element do its job (show alternative content)
-				setVisibility(id, true);
-			}
+				else if (counter < 10) {
+					counter++;
+					setTimeout(arguments.callee, 10);
+					return;
+				}
+				b.removeChild(o);
+				t = null;
+				matchVersions();
+			})();
+		}
+		else {
+			matchVersions();
 		}
 	}
 	
-	/* Fix nested param elements, which are ignored by older webkit engines
-		- This includes Safari up to and including version 1.2.2 on Mac OS 10.3
-		- Fall back to the proprietary embed element
+	/* Perform Flash Player and SWF version matching; static publishing only
 	*/
-	function fixParams(obj) {
-		var nestedObj = obj.getElementsByTagName(OBJECT)[0];
-		if (nestedObj) {
-			var e = createElement("embed"), a = nestedObj.attributes;
-			if (a) {
-				var al = a.length;
-				for (var i = 0; i < al; i++) {
-					if (a[i].nodeName == "DATA") {
-						e.setAttribute("src", a[i].nodeValue);
+	function matchVersions() {
+		var rl = regObjArr.length;
+		if (rl > 0) {
+			for (var i = 0; i < rl; i++) { // for each registered object element
+				var id = regObjArr[i].id;
+				var cb = regObjArr[i].callbackFn;
+				var cbObj = {success:false, id:id};
+				if (ua.pv[0] > 0) {
+					var obj = getElementById(id);
+					if (obj) {
+						if (hasPlayerVersion(regObjArr[i].swfVersion) && !(ua.wk && ua.wk < 312)) { // Flash Player version >= published SWF version: Houston, we have a match!
+							setVisibility(id, true);
+							if (cb) {
+								cbObj.success = true;
+								cbObj.ref = getObjectById(id);
+								cb(cbObj);
+							}
+						}
+						else if (regObjArr[i].expressInstall && canExpressInstall()) { // show the Adobe Express Install dialog if set by the web page author and if supported
+							var att = {};
+							att.data = regObjArr[i].expressInstall;
+							att.width = obj.getAttribute("width") || "0";
+							att.height = obj.getAttribute("height") || "0";
+							if (obj.getAttribute("class")) { att.styleclass = obj.getAttribute("class"); }
+							if (obj.getAttribute("align")) { att.align = obj.getAttribute("align"); }
+							// parse HTML object param element's name-value pairs
+							var par = {};
+							var p = obj.getElementsByTagName("param");
+							var pl = p.length;
+							for (var j = 0; j < pl; j++) {
+								if (p[j].getAttribute("name").toLowerCase() != "movie") {
+									par[p[j].getAttribute("name")] = p[j].getAttribute("value");
+								}
+							}
+							showExpressInstall(att, par, id, cb);
+						}
+						else { // Flash Player and SWF version mismatch or an older Webkit engine that ignores the HTML object element's nested param elements: display alternative content instead of SWF
+							displayAltContent(obj);
+							if (cb) { cb(cbObj); }
+						}
 					}
-					else {
-						e.setAttribute(a[i].nodeName, a[i].nodeValue);
+				}
+				else {	// if no Flash Player is installed or the fp version cannot be detected we let the HTML object element do its job (either show a SWF or alternative content)
+					setVisibility(id, true);
+					if (cb) {
+						var o = getObjectById(id); // test whether there is an HTML object element or not
+						if (o && typeof o.SetVariable != UNDEF) { 
+							cbObj.success = true;
+							cbObj.ref = o;
+						}
+						cb(cbObj);
 					}
 				}
 			}
-			var c = nestedObj.childNodes;
-			if (c) {
-				var cl = c.length;
-				for (var j = 0; j < cl; j++) {
-					if (c[j].nodeType == 1 && c[j].nodeName == "PARAM") {
-						e.setAttribute(c[j].getAttribute("name"), c[j].getAttribute("value"));
-					}
+		}
+	}
+	
+	function getObjectById(objectIdStr) {
+		var r = null;
+		var o = getElementById(objectIdStr);
+		if (o && o.nodeName == "OBJECT") {
+			if (typeof o.SetVariable != UNDEF) {
+				r = o;
+			}
+			else {
+				var n = o.getElementsByTagName(OBJECT)[0];
+				if (n) {
+					r = n;
 				}
 			}
-			obj.parentNode.replaceChild(e, obj);
 		}
+		return r;
+	}
+	
+	/* Requirements for Adobe Express Install
+		- only one instance can be active at a time
+		- fp 6.0.65 or higher
+		- Win/Mac OS only
+		- no Webkit engines older than version 312
+	*/
+	function canExpressInstall() {
+		return !isExpressInstallActive && hasPlayerVersion("6.0.65") && (ua.win || ua.mac) && !(ua.wk && ua.wk < 312);
 	}
 	
 	/* Show the Adobe Express Install dialog
 		- Reference: http://www.adobe.com/cfusion/knowledgebase/index.cfm?id=6a253b75
 	*/
-	function showExpressInstall(regObj) {
+	function showExpressInstall(att, par, replaceElemIdStr, callbackFn) {
 		isExpressInstallActive = true;
-		var obj = getElementById(regObj.id);
+		storedCallbackFn = callbackFn || null;
+		storedCallbackObj = {success:false, id:replaceElemIdStr};
+		var obj = getElementById(replaceElemIdStr);
 		if (obj) {
-			if (regObj.altContentId) {
-				var ac = getElementById(regObj.altContentId);
-				if (ac) {
-					storedAltContent = ac;
-					storedAltContentId = regObj.altContentId;
-				}
-			}
-			else {
+			if (obj.nodeName == "OBJECT") { // static publishing
 				storedAltContent = abstractAltContent(obj);
+				storedAltContentId = null;
 			}
-			if (!(/%$/.test(regObj.width)) && parseInt(regObj.width, 10) < 310) {
-				regObj.width = "310";
-			}
-			if (!(/%$/.test(regObj.height)) && parseInt(regObj.height, 10) < 137) {
-				regObj.height = "137";
+			else { // dynamic publishing
+				storedAltContent = obj;
+				storedAltContentId = replaceElemIdStr;
 			}
+			att.id = EXPRESS_INSTALL_ID;
+			if (typeof att.width == UNDEF || (!/%$/.test(att.width) && parseInt(att.width, 10) < 310)) { att.width = "310"; }
+			if (typeof att.height == UNDEF || (!/%$/.test(att.height) && parseInt(att.height, 10) < 137)) { att.height = "137"; }
 			doc.title = doc.title.slice(0, 47) + " - Flash Player Installation";
 			var pt = ua.ie && ua.win ? "ActiveX" : "PlugIn",
-				dt = doc.title,
-				fv = "MMredirectURL=" + win.location + "&MMplayerType=" + pt + "&MMdoctitle=" + dt,
-				replaceId = regObj.id;
-			// For IE when a SWF is loading (AND: not available in cache) wait for the onload event to fire to remove the original object element
-			// In IE you cannot properly cancel a loading SWF file without breaking browser load references, also obj.onreadystatechange doesn't work
+				fv = "MMredirectURL=" + win.location.toString().replace(/&/g,"%26") + "&MMplayerType=" + pt + "&MMdoctitle=" + doc.title;
+			if (typeof par.flashvars != UNDEF) {
+				par.flashvars += "&" + fv;
+			}
+			else {
+				par.flashvars = fv;
+			}
+			// IE only: when a SWF is loading (AND: not available in cache) wait for the readyState of the object element to become 4 before removing it,
+			// because you cannot properly cancel a loading SWF file without breaking browser load references, also obj.onreadystatechange doesn't work
 			if (ua.ie && ua.win && obj.readyState != 4) {
 				var newObj = createElement("div");
-				replaceId += "SWFObjectNew";
-				newObj.setAttribute("id", replaceId);
-				obj.parentNode.insertBefore(newObj, obj); // Insert placeholder div that will be replaced by the object element that loads expressinstall.swf
+				replaceElemIdStr += "SWFObjectNew";
+				newObj.setAttribute("id", replaceElemIdStr);
+				obj.parentNode.insertBefore(newObj, obj); // insert placeholder div that will be replaced by the object element that loads expressinstall.swf
 				obj.style.display = "none";
-				var fn = function() {
-					obj.parentNode.removeChild(obj);
-				};
-				addListener(win, "onload", fn);
+				(function(){
+					if (obj.readyState == 4) {
+						obj.parentNode.removeChild(obj);
+					}
+					else {
+						setTimeout(arguments.callee, 10);
+					}
+				})();
 			}
-			createSWF({ data:regObj.expressInstall, id:EXPRESS_INSTALL_ID, width:regObj.width, height:regObj.height }, { flashvars:fv }, replaceId);
+			createSWF(att, par, replaceElemIdStr);
 		}
 	}
 	
@@ -304,16 +360,20 @@ var swfobject = function() {
 	*/
 	function displayAltContent(obj) {
 		if (ua.ie && ua.win && obj.readyState != 4) {
-			// For IE when a SWF is loading (AND: not available in cache) wait for the onload event to fire to remove the original object element
-			// In IE you cannot properly cancel a loading SWF file without breaking browser load references, also obj.onreadystatechange doesn't work
+			// IE only: when a SWF is loading (AND: not available in cache) wait for the readyState of the object element to become 4 before removing it,
+			// because you cannot properly cancel a loading SWF file without breaking browser load references, also obj.onreadystatechange doesn't work
 			var el = createElement("div");
-			obj.parentNode.insertBefore(el, obj); // Insert placeholder div that will be replaced by the alternative content
+			obj.parentNode.insertBefore(el, obj); // insert placeholder div that will be replaced by the alternative content
 			el.parentNode.replaceChild(abstractAltContent(obj), el);
 			obj.style.display = "none";
-			var fn = function() {
-				obj.parentNode.removeChild(obj);
-			};
-			addListener(win, "onload", fn);
+			(function(){
+				if (obj.readyState == 4) {
+					obj.parentNode.removeChild(obj);
+				}
+				else {
+					setTimeout(arguments.callee, 10);
+				}
+			})();
 		}
 		else {
 			obj.parentNode.replaceChild(abstractAltContent(obj), obj);
@@ -346,14 +406,15 @@ var swfobject = function() {
 	*/
 	function createSWF(attObj, parObj, id) {
 		var r, el = getElementById(id);
+		if (ua.wk && ua.wk < 312) { return r; }
 		if (el) {
 			if (typeof attObj.id == UNDEF) { // if no 'id' is defined for the object element, it will inherit the 'id' from the alternative content
 				attObj.id = id;
 			}
-			if (ua.ie && ua.win) { // IE, the object element and W3C DOM methods do not combine: fall back to outerHTML
+			if (ua.ie && ua.win) { // Internet Explorer + the HTML object element + W3C DOM methods do not combine: fall back to outerHTML
 				var att = "";
 				for (var i in attObj) {
-					if (attObj[i] != Object.prototype[i]) { // Filter out prototype additions from other potential libraries, like Object.prototype.toJSONString = function() {}
+					if (attObj[i] != Object.prototype[i]) { // filter out prototype additions from other potential libraries
 						if (i.toLowerCase() == "data") {
 							parObj.movie = attObj[i];
 						}
@@ -367,55 +428,29 @@ var swfobject = function() {
 				}
 				var par = "";
 				for (var j in parObj) {
-					if (parObj[j] != Object.prototype[j]) { // Filter out prototype additions from other potential libraries
+					if (parObj[j] != Object.prototype[j]) { // filter out prototype additions from other potential libraries
 						par += '<param name="' + j + '" value="' + parObj[j] + '" />';
 					}
 				}
 				el.outerHTML = '<object classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"' + att + '>' + par + '</object>';
-				objIdArr[objIdArr.length] = attObj.id; // Stored to fix object 'leaks' on unload (dynamic publishing only)
+				objIdArr[objIdArr.length] = attObj.id; // stored to fix object 'leaks' on unload (dynamic publishing only)
 				r = getElementById(attObj.id);	
 			}
-			else if (ua.webkit && ua.webkit < 312) { // Older webkit engines ignore the object element's nested param elements: fall back to the proprietary embed element
-				var e = createElement("embed");
-				e.setAttribute("type", FLASH_MIME_TYPE);
-				for (var k in attObj) {
-					if (attObj[k] != Object.prototype[k]) { // Filter out prototype additions from other potential libraries
-						if (k.toLowerCase() == "data") {
-							e.setAttribute("src", attObj[k]);
-						}
-						else if (k.toLowerCase() == "styleclass") { // 'class' is an ECMA4 reserved keyword
-							e.setAttribute("class", attObj[k]);
-						}
-						else if (k.toLowerCase() != "classid") { // Filter out IE specific attribute
-							e.setAttribute(k, attObj[k]);
-						}
-					}
-				}
-				for (var l in parObj) {
-					if (parObj[l] != Object.prototype[l]) { // Filter out prototype additions from other potential libraries
-						if (l.toLowerCase() != "movie") { // Filter out IE specific param element
-							e.setAttribute(l, parObj[l]);
-						}
-					}
-				}
-				el.parentNode.replaceChild(e, el);
-				r = e;
-			}
-			else { // Well-behaving browsers
+			else { // well-behaving browsers
 				var o = createElement(OBJECT);
 				o.setAttribute("type", FLASH_MIME_TYPE);
 				for (var m in attObj) {
-					if (attObj[m] != Object.prototype[m]) { // Filter out prototype additions from other potential libraries
+					if (attObj[m] != Object.prototype[m]) { // filter out prototype additions from other potential libraries
 						if (m.toLowerCase() == "styleclass") { // 'class' is an ECMA4 reserved keyword
 							o.setAttribute("class", attObj[m]);
 						}
-						else if (m.toLowerCase() != "classid") { // Filter out IE specific attribute
+						else if (m.toLowerCase() != "classid") { // filter out IE specific attribute
 							o.setAttribute(m, attObj[m]);
 						}
 					}
 				}
 				for (var n in parObj) {
-					if (parObj[n] != Object.prototype[n] && n.toLowerCase() != "movie") { // Filter out prototype additions from other potential libraries and IE specific param element
+					if (parObj[n] != Object.prototype[n] && n.toLowerCase() != "movie") { // filter out prototype additions from other potential libraries and IE specific param element
 						createObjParam(o, n, parObj[n]);
 					}
 				}
@@ -438,16 +473,17 @@ var swfobject = function() {
 	*/
 	function removeSWF(id) {
 		var obj = getElementById(id);
-		if (obj && (obj.nodeName == "OBJECT" || obj.nodeName == "EMBED")) {
+		if (obj && obj.nodeName == "OBJECT") {
 			if (ua.ie && ua.win) {
-				if (obj.readyState == 4) {
-					removeObjectInIE(id);
-				}
-				else {
-					win.attachEvent("onload", function() {
+				obj.style.display = "none";
+				(function(){
+					if (obj.readyState == 4) {
 						removeObjectInIE(id);
-					});
-				}
+					}
+					else {
+						setTimeout(arguments.callee, 10);
+					}
+				})();
 			}
 			else {
 				obj.parentNode.removeChild(obj);
@@ -503,26 +539,41 @@ var swfobject = function() {
 	/* Cross-browser dynamic CSS creation
 		- Based on Bobby van der Sluis' solution: http://www.bobbyvandersluis.com/articles/dynamicCSS.php
 	*/	
-	function createCSS(sel, decl) {
-		if (ua.ie && ua.mac) {
-			return;
-		}
-		var h = doc.getElementsByTagName("head")[0], s = createElement("style");
-		s.setAttribute("type", "text/css");
-		s.setAttribute("media", "screen");
-		if (!(ua.ie && ua.win) && typeof doc.createTextNode != UNDEF) {
-			s.appendChild(doc.createTextNode(sel + " {" + decl + "}"));
+	function createCSS(sel, decl, media, newStyle) {
+		if (ua.ie && ua.mac) { return; }
+		var h = doc.getElementsByTagName("head")[0];
+		if (!h) { return; } // to also support badly authored HTML pages that lack a head element
+		var m = (media && typeof media == "string") ? media : "screen";
+		if (newStyle) {
+			dynamicStylesheet = null;
+			dynamicStylesheetMedia = null;
+		}
+		if (!dynamicStylesheet || dynamicStylesheetMedia != m) { 
+			// create dynamic stylesheet + get a global reference to it
+			var s = createElement("style");
+			s.setAttribute("type", "text/css");
+			s.setAttribute("media", m);
+			dynamicStylesheet = h.appendChild(s);
+			if (ua.ie && ua.win && typeof doc.styleSheets != UNDEF && doc.styleSheets.length > 0) {
+				dynamicStylesheet = doc.styleSheets[doc.styleSheets.length - 1];
+			}
+			dynamicStylesheetMedia = m;
+		}
+		// add style rule
+		if (ua.ie && ua.win) {
+			if (dynamicStylesheet && typeof dynamicStylesheet.addRule == OBJECT) {
+				dynamicStylesheet.addRule(sel, decl);
+			}
 		}
-		h.appendChild(s);
-		if (ua.ie && ua.win && typeof doc.styleSheets != UNDEF && doc.styleSheets.length > 0) {
-			var ls = doc.styleSheets[doc.styleSheets.length - 1];
-			if (typeof ls.addRule == OBJECT) {
-				ls.addRule(sel, decl);
+		else {
+			if (dynamicStylesheet && typeof doc.createTextNode != UNDEF) {
+				dynamicStylesheet.appendChild(doc.createTextNode(sel + " {" + decl + "}"));
 			}
 		}
 	}
 	
 	function setVisibility(id, isVisible) {
+		if (!autoHideShow) { return; }
 		var v = isVisible ? "visible" : "hidden";
 		if (isDomLoaded && getElementById(id)) {
 			getElementById(id).style.visibility = v;
@@ -532,12 +583,12 @@ var swfobject = function() {
 		}
 	}
 
-	/* Filter to avoid XSS attacks 
+	/* Filter to avoid XSS attacks
 	*/
 	function urlEncodeIfNecessary(s) {
 		var regex = /[\\\"<>\.;]/;
 		var hasBadChars = regex.exec(s) != null;
-		return hasBadChars ? encodeURIComponent(s) : s;
+		return hasBadChars && typeof encodeURIComponent != UNDEF ? encodeURIComponent(s) : s;
 	}
 	
 	/* Release memory to avoid memory leaks caused by closures, fix hanging audio/video threads and force open sockets/NetConnections to disconnect (Internet Explorer only)
@@ -568,70 +619,55 @@ var swfobject = function() {
 		}
 	}();
 	
-	
 	return {
 		/* Public API
-			- Reference: http://code.google.com/p/swfobject/wiki/SWFObject_2_0_documentation
+			- Reference: http://code.google.com/p/swfobject/wiki/documentation
 		*/ 
-		registerObject: function(objectIdStr, swfVersionStr, xiSwfUrlStr) {
-			if (!ua.w3cdom || !objectIdStr || !swfVersionStr) {
-				return;
-			}
-			var regObj = {};
-			regObj.id = objectIdStr;
-			regObj.swfVersion = swfVersionStr;
-			regObj.expressInstall = xiSwfUrlStr ? xiSwfUrlStr : false;
-			regObjArr[regObjArr.length] = regObj;
-			setVisibility(objectIdStr, false);
+		registerObject: function(objectIdStr, swfVersionStr, xiSwfUrlStr, callbackFn) {
+			if (ua.w3 && objectIdStr && swfVersionStr) {
+				var regObj = {};
+				regObj.id = objectIdStr;
+				regObj.swfVersion = swfVersionStr;
+				regObj.expressInstall = xiSwfUrlStr;
+				regObj.callbackFn = callbackFn;
+				regObjArr[regObjArr.length] = regObj;
+				setVisibility(objectIdStr, false);
+			}
+			else if (callbackFn) {
+				callbackFn({success:false, id:objectIdStr});
+			}
 		},
 		
 		getObjectById: function(objectIdStr) {
-			var r = null;
-			if (ua.w3cdom) {
-				var o = getElementById(objectIdStr);
-				if (o) {
-					var n = o.getElementsByTagName(OBJECT)[0];
-					if (!n || (n && typeof o.SetVariable != UNDEF)) {
-							r = o;
-					}
-					else if (typeof n.SetVariable != UNDEF) {
-						r = n;
-					}
-				}
+			if (ua.w3) {
+				return getObjectById(objectIdStr);
 			}
-			return r;
 		},
 		
-		embedSWF: function(swfUrlStr, replaceElemIdStr, widthStr, heightStr, swfVersionStr, xiSwfUrlStr, flashvarsObj, parObj, attObj) {
-			if (!ua.w3cdom || !swfUrlStr || !replaceElemIdStr || !widthStr || !heightStr || !swfVersionStr) {
-				return;
-			}
-			widthStr += ""; // Auto-convert to string
-			heightStr += "";
-			if (hasPlayerVersion(swfVersionStr)) {
+		embedSWF: function(swfUrlStr, replaceElemIdStr, widthStr, heightStr, swfVersionStr, xiSwfUrlStr, flashvarsObj, parObj, attObj, callbackFn) {
+			var callbackObj = {success:false, id:replaceElemIdStr};
+			if (ua.w3 && !(ua.wk && ua.wk < 312) && swfUrlStr && replaceElemIdStr && widthStr && heightStr && swfVersionStr) {
 				setVisibility(replaceElemIdStr, false);
-				var att = {};
-				if (attObj && typeof attObj === OBJECT) {
-					for (var i in attObj) {
-						if (attObj[i] != Object.prototype[i]) { // Filter out prototype additions from other potential libraries
+				addDomLoadEvent(function() {
+					widthStr += ""; // auto-convert to string
+					heightStr += "";
+					var att = {};
+					if (attObj && typeof attObj === OBJECT) {
+						for (var i in attObj) { // copy object to avoid the use of references, because web authors often reuse attObj for multiple SWFs
 							att[i] = attObj[i];
 						}
 					}
-				}
-				att.data = swfUrlStr;
-				att.width = widthStr;
-				att.height = heightStr;
-				var par = {}; 
-				if (parObj && typeof parObj === OBJECT) {
-					for (var j in parObj) {
-						if (parObj[j] != Object.prototype[j]) { // Filter out prototype additions from other potential libraries
+					att.data = swfUrlStr;
+					att.width = widthStr;
+					att.height = heightStr;
+					var par = {}; 
+					if (parObj && typeof parObj === OBJECT) {
+						for (var j in parObj) { // copy object to avoid the use of references, because web authors often reuse parObj for multiple SWFs
 							par[j] = parObj[j];
 						}
 					}
-				}
-				if (flashvarsObj && typeof flashvarsObj === OBJECT) {
-					for (var k in flashvarsObj) {
-						if (flashvarsObj[k] != Object.prototype[k]) { // Filter out prototype additions from other potential libraries
+					if (flashvarsObj && typeof flashvarsObj === OBJECT) {
+						for (var k in flashvarsObj) { // copy object to avoid the use of references, because web authors often reuse flashvarsObj for multiple SWFs
 							if (typeof par.flashvars != UNDEF) {
 								par.flashvars += "&" + k + "=" + flashvarsObj[k];
 							}
@@ -640,28 +676,34 @@ var swfobject = function() {
 							}
 						}
 					}
-				}
-				addDomLoadEvent(function() {
-					createSWF(att, par, replaceElemIdStr);
-					if (att.id == replaceElemIdStr) {
+					if (hasPlayerVersion(swfVersionStr)) { // create SWF
+						var obj = createSWF(att, par, replaceElemIdStr);
+						if (att.id == replaceElemIdStr) {
+							setVisibility(replaceElemIdStr, true);
+						}
+						callbackObj.success = true;
+						callbackObj.ref = obj;
+					}
+					else if (xiSwfUrlStr && canExpressInstall()) { // show Adobe Express Install
+						att.data = xiSwfUrlStr;
+						showExpressInstall(att, par, replaceElemIdStr, callbackFn);
+						return;
+					}
+					else { // show alternative content
 						setVisibility(replaceElemIdStr, true);
 					}
+					if (callbackFn) { callbackFn(callbackObj); }
 				});
 			}
-			else if (xiSwfUrlStr && !isExpressInstallActive && hasPlayerVersion("6.0.65") && (ua.win || ua.mac)) {
-				isExpressInstallActive = true; // deferred execution
-				setVisibility(replaceElemIdStr, false);
-				addDomLoadEvent(function() {
-					var regObj = {};
-					regObj.id = regObj.altContentId = replaceElemIdStr;
-					regObj.width = widthStr;
-					regObj.height = heightStr;
-					regObj.expressInstall = xiSwfUrlStr;
-					showExpressInstall(regObj);
-				});
-			}
+			else if (callbackFn) { callbackFn(callbackObj);	}
 		},
 		
+		switchOffAutoHideShow: function() {
+			autoHideShow = false;
+		},
+		
+		ua: ua,
+		
 		getFlashPlayerVersion: function() {
 			return { major:ua.pv[0], minor:ua.pv[1], release:ua.pv[2] };
 		},
@@ -669,7 +711,7 @@ var swfobject = function() {
 		hasFlashPlayerVersion: hasPlayerVersion,
 		
 		createSWF: function(attObj, parObj, replaceElemIdStr) {
-			if (ua.w3cdom) {
+			if (ua.w3) {
 				return createSWF(attObj, parObj, replaceElemIdStr);
 			}
 			else {
@@ -677,15 +719,21 @@ var swfobject = function() {
 			}
 		},
 		
+		showExpressInstall: function(att, par, replaceElemIdStr, callbackFn) {
+			if (ua.w3 && canExpressInstall()) {
+				showExpressInstall(att, par, replaceElemIdStr, callbackFn);
+			}
+		},
+		
 		removeSWF: function(objElemIdStr) {
-			if (ua.w3cdom) {
+			if (ua.w3) {
 				removeSWF(objElemIdStr);
 			}
 		},
 		
-		createCSS: function(sel, decl) {
-			if (ua.w3cdom) {
-				createCSS(sel, decl);
+		createCSS: function(selStr, declStr, mediaStr, newStyleBoolean) {
+			if (ua.w3) {
+				createCSS(selStr, declStr, mediaStr, newStyleBoolean);
 			}
 		},
 		
@@ -695,11 +743,12 @@ var swfobject = function() {
 		
 		getQueryParamValue: function(param) {
 			var q = doc.location.search || doc.location.hash;
-			if (param == null) {
-				return urlEncodeIfNecessary(q);
-			}
 			if (q) {
-				var pairs = q.substring(1).split("&");
+				if (/\?/.test(q)) { q = q.split("?")[1]; } // strip question mark
+				if (param == null) {
+					return urlEncodeIfNecessary(q);
+				}
+				var pairs = q.split("&");
 				for (var i = 0; i < pairs.length; i++) {
 					if (pairs[i].substring(0, pairs[i].indexOf("=")) == param) {
 						return urlEncodeIfNecessary(pairs[i].substring((pairs[i].indexOf("=") + 1)));
@@ -711,20 +760,17 @@ var swfobject = function() {
 		
 		// For internal usage only
 		expressInstallCallback: function() {
-			if (isExpressInstallActive && storedAltContent) {
+			if (isExpressInstallActive) {
 				var obj = getElementById(EXPRESS_INSTALL_ID);
-				if (obj) {
+				if (obj && storedAltContent) {
 					obj.parentNode.replaceChild(storedAltContent, obj);
 					if (storedAltContentId) {
 						setVisibility(storedAltContentId, true);
-						if (ua.ie && ua.win) {
-							storedAltContent.style.display = "block";
-						}
+						if (ua.ie && ua.win) { storedAltContent.style.display = "block"; }
 					}
-					storedAltContent = null;
-					storedAltContentId = null;
-					isExpressInstallActive = false;
+					if (storedCallbackFn) { storedCallbackFn(storedCallbackObj); }
 				}
+				isExpressInstallActive = false;
 			} 
 		}
 	};
diff --git a/HelloFlash/src/org/robotlegs/demos/helloflash/model/StatsModel.as b/HelloFlash/src/org/robotlegs/demos/helloflash/model/StatsModel.as
index 418b780..785263f 100644
--- a/HelloFlash/src/org/robotlegs/demos/helloflash/model/StatsModel.as
+++ b/HelloFlash/src/org/robotlegs/demos/helloflash/model/StatsModel.as
@@ -22,9 +22,9 @@
 
 package org.robotlegs.demos.helloflash.model
 {
-	import org.robotlegs.mvcs.Model;
+	import org.robotlegs.mvcs.Actor;
 	
-	public class StatsModel extends Model
+	public class StatsModel extends Actor
 	{
 		protected var _ballClickCount:int;
 		
diff --git a/HelloFlash/src/org/robotlegs/demos/helloflash/view/Ball.as b/HelloFlash/src/org/robotlegs/demos/helloflash/view/Ball.as
index b438616..3284835 100644
--- a/HelloFlash/src/org/robotlegs/demos/helloflash/view/Ball.as
+++ b/HelloFlash/src/org/robotlegs/demos/helloflash/view/Ball.as
@@ -26,19 +26,24 @@ package org.robotlegs.demos.helloflash.view
 	
 	public class Ball extends Sprite
 	{
+		protected var color:uint;
+		protected var radius:Number = 10;
+		
 		public function Ball()
 		{
 			useHandCursor = true;
 			buttonMode = true;
-			draw(10);
+			draw();
 		}
 		
-		public function randomize():void
+		public function poke():void
 		{
-			draw(Math.random() * 90 + 10, Math.random() * uint.MAX_VALUE);
+			radius++;
+			color = Math.random() * uint.MAX_VALUE;
+			draw();
 		}
 		
-		public function draw(radius:Number, color:uint = 0):void
+		public function draw():void
 		{
 			graphics.clear();
 			graphics.beginFill(color);
diff --git a/HelloFlash/src/org/robotlegs/demos/helloflash/view/BallMediator.as b/HelloFlash/src/org/robotlegs/demos/helloflash/view/BallMediator.as
index 45e43a5..646834d 100644
--- a/HelloFlash/src/org/robotlegs/demos/helloflash/view/BallMediator.as
+++ b/HelloFlash/src/org/robotlegs/demos/helloflash/view/BallMediator.as
@@ -61,7 +61,7 @@ package org.robotlegs.demos.helloflash.view
 		protected function onSomeBallClicked(e:HelloFlashEvent):void
 		{
 			// Manipulate the view
-			view.randomize();
+			view.poke();
 		}
 	}
 }
\ No newline at end of file
diff --git a/HelloFlex/src/org/robotlegs/demos/helloflex/controller/PrepServicesCommand.as b/HelloFlex/src/org/robotlegs/demos/helloflex/controller/PrepServicesCommand.as
index 436cbab..4a935db 100644
--- a/HelloFlex/src/org/robotlegs/demos/helloflex/controller/PrepServicesCommand.as
+++ b/HelloFlex/src/org/robotlegs/demos/helloflex/controller/PrepServicesCommand.as
@@ -1,6 +1,29 @@
+/*
+ * Copyright (c) 2009 the original author or authors
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
 package org.robotlegs.demos.helloflex.controller.commands
 {
-	import org.robotlegs.demos.helloflex.remote.services.*;
+	import org.robotlegs.demos.helloflex.services.DummyAuthService;
+	import org.robotlegs.demos.helloflex.services.IAuthService;
 	import org.robotlegs.mvcs.Command;
 	
 	public class PrepServicesCommand extends Command
diff --git a/HelloFlex/src/org/robotlegs/demos/helloflex/controller/SystemEvent.as b/HelloFlex/src/org/robotlegs/demos/helloflex/controller/SystemEvent.as
index 5c21d5a..04083ea 100644
--- a/HelloFlex/src/org/robotlegs/demos/helloflex/controller/SystemEvent.as
+++ b/HelloFlex/src/org/robotlegs/demos/helloflex/controller/SystemEvent.as
@@ -1,3 +1,24 @@
+/*
+ * Copyright (c) 2009 the original author or authors
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
 package org.robotlegs.demos.helloflex.controller
 {
 	import flash.events.Event;
diff --git a/HelloFlex/src/org/robotlegs/demos/helloflex/controller/TryClearMessages.as b/HelloFlex/src/org/robotlegs/demos/helloflex/controller/TryClearMessages.as
index 6d2658b..4105dde 100644
--- a/HelloFlex/src/org/robotlegs/demos/helloflex/controller/TryClearMessages.as
+++ b/HelloFlex/src/org/robotlegs/demos/helloflex/controller/TryClearMessages.as
@@ -1,3 +1,25 @@
+/*
+ * Copyright (c) 2009 the original author or authors
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
 package org.robotlegs.demos.helloflex.controller
 {
 	import org.robotlegs.demos.helloflex.model.MessageModel;
diff --git a/HelloFlex/src/org/robotlegs/demos/helloflex/model/MessageModel.as b/HelloFlex/src/org/robotlegs/demos/helloflex/model/MessageModel.as
index 256bb8c..7dc2b9d 100644
--- a/HelloFlex/src/org/robotlegs/demos/helloflex/model/MessageModel.as
+++ b/HelloFlex/src/org/robotlegs/demos/helloflex/model/MessageModel.as
@@ -1,10 +1,32 @@
+/*
+ * Copyright (c) 2009 the original author or authors
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
 package org.robotlegs.demos.helloflex.model
 {
 	import mx.collections.ArrayCollection;
 	
-	import org.robotlegs.mvcs.Model;
+	import org.robotlegs.mvcs.Actor;
 	
-	public class MessageModel extends Model
+	public class MessageModel extends Actor
 	{
 		private var messages:ArrayCollection;
 		
diff --git a/HelloFlex/src/org/robotlegs/demos/helloflex/model/MessageModelEvent.as b/HelloFlex/src/org/robotlegs/demos/helloflex/model/MessageModelEvent.as
index 3b3b467..d3799b3 100644
--- a/HelloFlex/src/org/robotlegs/demos/helloflex/model/MessageModelEvent.as
+++ b/HelloFlex/src/org/robotlegs/demos/helloflex/model/MessageModelEvent.as
@@ -1,3 +1,24 @@
+/*
+ * Copyright (c) 2009 the original author or authors
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
 package org.robotlegs.demos.helloflex.model
 {
 	import flash.events.Event;
diff --git a/HelloFlex/src/org/robotlegs/demos/helloflex/model/UserProxy.as b/HelloFlex/src/org/robotlegs/demos/helloflex/model/UserProxy.as
index ded7ded..257f031 100644
--- a/HelloFlex/src/org/robotlegs/demos/helloflex/model/UserProxy.as
+++ b/HelloFlex/src/org/robotlegs/demos/helloflex/model/UserProxy.as
@@ -1,8 +1,30 @@
+/*
+ * Copyright (c) 2009 the original author or authors
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
 package org.robotlegs.demos.helloflex.model
 {
-	import org.robotlegs.mvcs.Model;
+	import org.robotlegs.mvcs.Actor;
 	
-	public class UserProxy extends Model
+	public class UserProxy extends Actor
 	{
 		private var username:String;
 		private var loggedIn:Boolean;
diff --git a/HelloFlex/src/org/robotlegs/demos/helloflex/model/UserProxyEvent.as b/HelloFlex/src/org/robotlegs/demos/helloflex/model/UserProxyEvent.as
index 0f5b895..832345a 100644
--- a/HelloFlex/src/org/robotlegs/demos/helloflex/model/UserProxyEvent.as
+++ b/HelloFlex/src/org/robotlegs/demos/helloflex/model/UserProxyEvent.as
@@ -1,3 +1,24 @@
+/*
+* Copyright (c) 2009 the original author or authors
+*
+* Permission is hereby granted, free of charge, to any person obtaining a copy
+* of this software and associated documentation files (the "Software"), to deal
+* in the Software without restriction, including without limitation the rights
+* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+* copies of the Software, and to permit persons to whom the Software is
+* furnished to do so, subject to the following conditions:
+*
+* The above copyright notice and this permission notice shall be included in
+* all copies or substantial portions of the Software.
+*
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+* THE SOFTWARE.
+*/
 package org.robotlegs.demos.helloflex.model
 {
 	import flash.events.Event;
diff --git a/HelloFlex/src/org/robotlegs/demos/helloflex/services/DummyAuthService.as b/HelloFlex/src/org/robotlegs/demos/helloflex/services/DummyAuthService.as
index 85dfd06..f177c98 100644
--- a/HelloFlex/src/org/robotlegs/demos/helloflex/services/DummyAuthService.as
+++ b/HelloFlex/src/org/robotlegs/demos/helloflex/services/DummyAuthService.as
@@ -1,9 +1,30 @@
+/*
+ * Copyright (c) 2009 the original author or authors
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
 package org.robotlegs.demos.helloflex.services
 {
 	import org.robotlegs.demos.helloflex.model.UserProxy;
-	import org.robotlegs.mvcs.Service;
+	import org.robotlegs.mvcs.Actor;
 	
-	public class DummyAuthService extends Service implements IAuthService
+	public class DummyAuthService extends Actor implements IAuthService
 	{
 		[Inject]
 		public var userProxy:UserProxy;
diff --git a/HelloFlex/src/org/robotlegs/demos/helloflex/services/IAuthService.as b/HelloFlex/src/org/robotlegs/demos/helloflex/services/IAuthService.as
index d1de0b6..838965d 100644
--- a/HelloFlex/src/org/robotlegs/demos/helloflex/services/IAuthService.as
+++ b/HelloFlex/src/org/robotlegs/demos/helloflex/services/IAuthService.as
@@ -1,3 +1,24 @@
+/*
+* Copyright (c) 2009 the original author or authors
+*
+* Permission is hereby granted, free of charge, to any person obtaining a copy
+* of this software and associated documentation files (the "Software"), to deal
+* in the Software without restriction, including without limitation the rights
+* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+* copies of the Software, and to permit persons to whom the Software is
+* furnished to do so, subject to the following conditions:
+*
+* The above copyright notice and this permission notice shall be included in
+* all copies or substantial portions of the Software.
+*
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+* THE SOFTWARE.
+*/
 package org.robotlegs.demos.helloflex.services
 {
 	import flash.events.Event;
diff --git a/LazyStack/src/LazyStack.mxml b/LazyStack/src/LazyStack.mxml
index 09bc564..1bcb2a9 100644
--- a/LazyStack/src/LazyStack.mxml
+++ b/LazyStack/src/LazyStack.mxml
@@ -1,16 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <mx:Application xmlns:mx="http://www.adobe.com/2006/mxml"
 				xmlns:lazystack="org.robotlegs.demos.lazystack.*"
-				layout="absolute"
-				minWidth="1024"
-				minHeight="768">
+				layout="vertical"
+				paddingBottom="10"
+				paddingLeft="10"
+				paddingRight="10"
+				paddingTop="10"
+				minWidth="400"
+				minHeight="300">
 
-	<mx:TabNavigator width="90%"
-					 height="90%">
+	<mx:TabNavigator width="100%"
+					 height="100%">
 
 		<mx:Canvas label="Blank 1"/>
 		<mx:Canvas label="Blank 2"/>
-		
+
 		<lazystack:MainView label="Lazy!"/>
 		<lazystack:MainView label="Lazy 2!"/>
 
diff --git a/LazyStack/src/org/robotlegs/demos/lazystack/MainView.mxml b/LazyStack/src/org/robotlegs/demos/lazystack/MainView.mxml
index 9707994..be140da 100644
--- a/LazyStack/src/org/robotlegs/demos/lazystack/MainView.mxml
+++ b/LazyStack/src/org/robotlegs/demos/lazystack/MainView.mxml
@@ -18,8 +18,8 @@
 		]]>
 	</mx:Script>
 
-	<mx:TabNavigator width="90%"
-					 height="90%">
+	<mx:TabNavigator width="100%"
+					 height="100%">
 		<lazystack:ComponentA label="ComponentA"/>
 		<lazystack:ComponentB label="ComponentB"/>
 		<lazystack:ComponentA label="ComponentA"/>
diff --git a/SizeTest/.actionScriptProperties b/SizeTest/.actionScriptProperties
index 0f39c8b..7889c9c 100644
--- a/SizeTest/.actionScriptProperties
+++ b/SizeTest/.actionScriptProperties
@@ -1,28 +1,28 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <actionScriptProperties mainApplicationPath="RobotlegsMvcsContextSize.as" projectUUID="d4bcbd60-db3f-4274-9388-823b4a90dcc7" version="6">
   <compiler additionalCompilerArguments="-locale en_US" autoRSLOrdering="false" copyDependentFiles="true" flexSDK="Flex 3.4" generateAccessible="false" htmlExpressInstall="true" htmlGenerate="false" htmlHistoryManagement="true" htmlPlayerVersionCheck="true" includeNetmonSwc="false" outputFolderPath="bin-debug" sourceFolderPath="src" strict="true" targetPlayerVersion="0.0.0" useApolloConfig="false" useDebugRSLSwfs="true" verifyDigests="false" warn="true">
     <compilerSourcePath/>
     <libraryPath defaultLinkType="0">
       <libraryPathEntry kind="4" path="">
         <excludedEntries>
-          <libraryPathEntry kind="3" linkType="1" path="${PROJECT_FRAMEWORKS}/libs/automation_charts.swc" useDefaultLinkType="false"/>
+          <libraryPathEntry kind="3" linkType="1" path="${PROJECT_FRAMEWORKS}/libs/netmon.swc" useDefaultLinkType="false"/>
+          <libraryPathEntry kind="3" linkType="1" path="${PROJECT_FRAMEWORKS}/libs/automation_agent.swc" useDefaultLinkType="false"/>
+          <libraryPathEntry kind="3" linkType="1" path="${PROJECT_FRAMEWORKS}/libs/automation.swc" useDefaultLinkType="false"/>
+          <libraryPathEntry kind="3" linkType="1" path="${PROJECT_FRAMEWORKS}/libs/sparkskins.swc" useDefaultLinkType="false"/>
           <libraryPathEntry kind="1" linkType="1" path="${PROJECT_FRAMEWORKS}/locale/{locale}"/>
-          <libraryPathEntry kind="3" linkType="1" path="${PROJECT_FRAMEWORKS}/libs/qtp.swc" useDefaultLinkType="false"/>
           <libraryPathEntry kind="3" linkType="1" path="${PROJECT_FRAMEWORKS}/libs/charts.swc" useDefaultLinkType="false"/>
+          <libraryPathEntry kind="3" linkType="1" path="${PROJECT_FRAMEWORKS}/libs/automation_dmv.swc" useDefaultLinkType="false"/>
           <libraryPathEntry kind="3" linkType="1" path="${PROJECT_FRAMEWORKS}/libs/automation_air.swc" useDefaultLinkType="false"/>
+          <libraryPathEntry kind="3" linkType="1" path="${PROJECT_FRAMEWORKS}/libs/videoPlayer.swc" useDefaultLinkType="false"/>
           <libraryPathEntry kind="3" linkType="1" path="${PROJECT_FRAMEWORKS}/libs/framework.swc" useDefaultLinkType="false"/>
-          <libraryPathEntry kind="3" linkType="1" path="${PROJECT_FRAMEWORKS}/libs/netmon.swc" useDefaultLinkType="false"/>
           <libraryPathEntry kind="3" linkType="1" path="${PROJECT_FRAMEWORKS}/libs/spark.swc" useDefaultLinkType="false"/>
-          <libraryPathEntry kind="3" linkType="1" path="${PROJECT_FRAMEWORKS}/libs/sparkskins.swc" useDefaultLinkType="false"/>
-          <libraryPathEntry kind="3" linkType="1" path="${PROJECT_FRAMEWORKS}/libs/rpc.swc" useDefaultLinkType="false"/>
-          <libraryPathEntry kind="3" linkType="1" path="${PROJECT_FRAMEWORKS}/libs/datavisualization.swc" useDefaultLinkType="false"/>
-          <libraryPathEntry kind="3" linkType="1" path="${PROJECT_FRAMEWORKS}/libs/videoPlayer.swc" useDefaultLinkType="false"/>
           <libraryPathEntry kind="3" linkType="1" path="${PROJECT_FRAMEWORKS}/libs/qtp_air.swc" useDefaultLinkType="false"/>
-          <libraryPathEntry kind="3" linkType="1" path="${PROJECT_FRAMEWORKS}/libs/framework_textLayout.swc" useDefaultLinkType="false"/>
-          <libraryPathEntry kind="3" linkType="1" path="${PROJECT_FRAMEWORKS}/libs/automation.swc" useDefaultLinkType="false"/>
-          <libraryPathEntry kind="3" linkType="1" path="${PROJECT_FRAMEWORKS}/libs/automation_dmv.swc" useDefaultLinkType="false"/>
           <libraryPathEntry kind="3" linkType="1" path="${PROJECT_FRAMEWORKS}/libs/automation_flashflexkit.swc" useDefaultLinkType="false"/>
-          <libraryPathEntry kind="3" linkType="1" path="${PROJECT_FRAMEWORKS}/libs/automation_agent.swc" useDefaultLinkType="false"/>
+          <libraryPathEntry kind="3" linkType="1" path="${PROJECT_FRAMEWORKS}/libs/qtp.swc" useDefaultLinkType="false"/>
+          <libraryPathEntry kind="3" linkType="1" path="${PROJECT_FRAMEWORKS}/libs/framework_textLayout.swc" useDefaultLinkType="false"/>
+          <libraryPathEntry kind="3" linkType="1" path="${PROJECT_FRAMEWORKS}/libs/rpc.swc" useDefaultLinkType="false"/>
+          <libraryPathEntry kind="3" linkType="1" path="${PROJECT_FRAMEWORKS}/libs/datavisualization.swc" useDefaultLinkType="false"/>
+          <libraryPathEntry kind="3" linkType="1" path="${PROJECT_FRAMEWORKS}/libs/automation_charts.swc" useDefaultLinkType="false"/>
         </excludedEntries>
       </libraryPathEntry>
       <libraryPathEntry kind="3" linkType="1" path="/robotlegs-framework/bin/robotlegs-framework.swc" useDefaultLinkType="false"/>
@@ -30,9 +30,10 @@
     <sourceAttachmentPath/>
   </compiler>
   <applications>
+    <application path="RobotlegsBaseContextSize.as"/>
     <application path="RobotlegsMvcsContextSize.as"/>
+    <application path="RobotlegsNometaContextSize.as"/>
     <application path="SwiftSuspendersSize.as"/>
-    <application path="RobotlegsBaseContextSize.as"/>
     <application path="EmptySize.as"/>
   </applications>
   <modules/>
diff --git a/SizeTest/src/RobotlegsNometaContextSize.as b/SizeTest/src/RobotlegsNometaContextSize.as
new file mode 100644
index 0000000..c092693
--- /dev/null
+++ b/SizeTest/src/RobotlegsNometaContextSize.as
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2009 the original author or authors
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+package
+{
+	import flash.display.Sprite;
+	
+	import org.robotlegs.nometa.Context;
+	
+	public class RobotlegsNometaContextSize extends Sprite
+	{
+		public function RobotlegsNometaContextSize()
+		{
+			new Context(this);
+		}
+	}
+}
\ No newline at end of file
diff --git a/WheresWindow/src/org/robotlegs/demos/whereswindow/model/OpenWindowsProxy.as b/WheresWindow/src/org/robotlegs/demos/whereswindow/model/OpenWindowsProxy.as
index 45572a8..7a87828 100644
--- a/WheresWindow/src/org/robotlegs/demos/whereswindow/model/OpenWindowsProxy.as
+++ b/WheresWindow/src/org/robotlegs/demos/whereswindow/model/OpenWindowsProxy.as
@@ -8,14 +8,14 @@ package org.robotlegs.demos.whereswindow.model
 	
 	import org.robotlegs.demos.whereswindow.events.InfoWindowEvent;
 	import org.robotlegs.demos.whereswindow.view.components.InfoWindow;
-	import org.robotlegs.mvcs.Model;
+	import org.robotlegs.mvcs.Actor;
 	
 	/**
 	 * Proxy to keep track of current open <code>InfoWindow</code> objects
 	 * @author joel
 	 *
 	 */
-	public class OpenWindowsProxy extends Model
+	public class OpenWindowsProxy extends Actor
 	{
 		/**
 		 * Hash of currently open windows