diff --git a/VERSION b/VERSION
index 5d46a353..fcd88f89 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 1.99.3 (2011-11-29 09:50:33) dev
+Version 1.99.3 (2011-11-29 22:29:36) dev
diff --git a/applications/examples/controllers/default.py b/applications/examples/controllers/default.py
index 2a1770fd..3d45a54f 100644
--- a/applications/examples/controllers/default.py
+++ b/applications/examples/controllers/default.py
@@ -8,7 +8,7 @@ response.description = T('web2py Web Framework')
 
 session.forget()
 
-@cache('index')
+#@cache('index')
 def index():
     return response.render()
 
diff --git a/applications/examples/static/css/examples.css b/applications/examples/static/css/examples.css
index b262c124..e66ea91b 100644
--- a/applications/examples/static/css/examples.css
+++ b/applications/examples/static/css/examples.css
@@ -15,7 +15,6 @@ ul { list-style: circle outside;}
 .announce a { color: white !important;}
 
 input:focus,textarea:focus {background:#f0f0f0!important}
-
 table.downloads { width:100%; }
 table.downloads th, table.downloads td {text-align:center;}
 table.downloads a.button { width: 150px; }
diff --git a/applications/examples/static/css/web2py.css b/applications/examples/static/css/web2py.css
index 2d1b7734..e1968dca 100644
--- a/applications/examples/static/css/web2py.css
+++ b/applications/examples/static/css/web2py.css
@@ -50,7 +50,11 @@ html, body {
 .footer, .push {
   height: 6em;
   padding: 1em 0;
-  clear: both;
+  clear: both;  
+}
+
+.footer {
+  padding-bottom: 100px;
 }
 
 .footer-content {position: relative; bottom: -4em; width: 100%;}
diff --git a/applications/examples/static/images/tag-cloud-color-small.png b/applications/examples/static/images/tag-cloud-color-small.png
index 17fd4091..18ff781a 100644
Binary files a/applications/examples/static/images/tag-cloud-color-small.png and b/applications/examples/static/images/tag-cloud-color-small.png differ
diff --git a/applications/examples/views/default/index.html b/applications/examples/views/default/index.html
index cb110915..4aa6f8ec 100644
--- a/applications/examples/views/default/index.html
+++ b/applications/examples/views/default/index.html
@@ -6,7 +6,8 @@
 </center>
 
 <h3>WEB2PY<sup>TM</sup> WEB FRAMEWORK</h3>
-<p>Free open source full-stack framework for rapid development of fast, scalable, <a href="http://www.web2py.com/book/default/chapter/01#security" target="_blank">secure</a> and portable database-driven web-based applications. Written and programmable in <a href="http://www.python.org" target="_blank">Python</a>. <a href="http://www.gnu.org/licenses/lgpl.html">LGPLv3 License</a></p>
+<p>Free open source full-stack framework for rapid development of fast, scalable, <a href="http://www.web2py.com/book/default/chapter/01#security" target="_blank">secure</a> and portable database-driven web-based applications. Written and programmable in <a href="http://www.python.org" target="_blank">Python</a>. <a href="http://www.gnu.org/licenses/lgpl.html">LGPLv3 License</a>.
+Current version: {{="%s.%s.%s (%s) %s" % request.env.web2py_version}}</p>
 
 {{block extra}}
 <div class="container">
@@ -46,8 +47,8 @@
 <div style="text-align:center">
   <a href="http://web2py.com/book"><img src="{{=URL('static','images/tablet.png')}}" alt="Tablet" /></a>
   <br/>
-  <a class="button" href="{{=URL('download')}}">DOWNLOAD NOW<br/>
-    {{="%s.%s.%s (%s) %s" % request.env.web2py_version}}
-  </a>
+  <a class="button" href="{{=URL('download')}}" style="width:90%">DOWNLOAD NOW</a><br/>
+  <a class="button" href="http://web2py.com/demo_admin" style="width:90%">ONLINE DEMO</a><br/>
+  <a class="button" href="http://web2py.com/poweredby" style="width:90%">SITES POWERED</a>  
 </div>
 {{end}}
diff --git a/applications/welcome/static/css/web2py.css b/applications/welcome/static/css/web2py.css
index 2d1b7734..e1968dca 100644
--- a/applications/welcome/static/css/web2py.css
+++ b/applications/welcome/static/css/web2py.css
@@ -50,7 +50,11 @@ html, body {
 .footer, .push {
   height: 6em;
   padding: 1em 0;
-  clear: both;
+  clear: both;  
+}
+
+.footer {
+  padding-bottom: 100px;
 }
 
 .footer-content {position: relative; bottom: -4em; width: 100%;}
diff --git a/gluon/contrib/user_agent_parser.py b/gluon/contrib/user_agent_parser.py
index 78df5a2e..cd88dfc7 100644
--- a/gluon/contrib/user_agent_parser.py
+++ b/gluon/contrib/user_agent_parser.py
@@ -179,6 +179,13 @@ class Linux(OS):
     def getVersion(self, agent):
         pass
 
+class RIM(OS):
+    look_for = 'BlackBerry'
+    prefs = dict(dist=[None], flavor=None)
+
+    def getVersion(self, agent):
+        pass
+
 
 class Macintosh(OS):
     look_for = 'Macintosh'
@@ -204,7 +211,7 @@ class MacOS(Flavor):
 class Windows(OS):
     look_for = 'Windows'
     prefs = dict(browser=["Microsoft Internet Explorer", 'Firefox'],
-                 dict=None, flavor=None)
+                 dist=['WindowsMobile'] flavor=None)
 
     def getVersion(self, agent):
         v = agent.split('Windows')[-1].split(';')[0].strip()
@@ -237,6 +244,13 @@ class ChromeOS(OS):
         vs = self.version_splitters
         return agent.split(self.look_for+vs[0])[-1].split(vs[1])[1].strip()[:-1]
 
+class WindowsMobile(Dist):
+    look_for = 'Windows Phone'
+    is_mobile = True
+
+    def getVersion(self, agent):
+        return agent.split('Windows Phone')[-1].split(';')[0].strip().split(' ')[-1]
+
 class Android(Dist):
     look_for = 'Android'
     is_mobile = True