diff --git a/Makefile b/Makefile
index d764297d..3193225d 100644
--- a/Makefile
+++ b/Makefile
@@ -29,7 +29,7 @@ update:
 	wget -O gluon/contrib/simplejsonrpc.py http://rad2py.googlecode.com/hg/ide2py/simplejsonrpc.py
 	echo "remember that pymysql was tweaked"
 src:
-	echo 'Version 2.0.9 ('`date +%Y-%m-%d\ %H:%M:%S`') stable' > VERSION
+	echo 'Version 2.0.9 ('`date +%Y-%m-%d\ %H:%M:%S`') dev' > VERSION
 	### rm -f all junk files
 	make clean
 	### clean up baisc apps
@@ -107,10 +107,6 @@ win:
 	cp applications/__init__.py ../web2py_win/web2py/applications
 	cd ../web2py_win; zip -r web2py_win.zip web2py
 	mv ../web2py_win/web2py_win.zip .
-pip:
-	# create Web2py distribution for upload to Pypi
-	# after upload clean Web2py sources with rm -R ./dist
-	python setup.py sdist
 run:
 	python2.5 web2py.py -a hello
 commit:
@@ -129,3 +125,10 @@ tag:
 	hg tag -l '$(S)'
 	make commit S='$(S)'
 	make push
+pip:
+	# create Web2py distribution for upload to Pypi
+	# after upload clean Web2py sources with rm -R ./dist
+	# http://guide.python-distribute.org/creation.html
+	python setup.py sdist
+	python setup.py register
+	python setup.py sdist upload
diff --git a/VERSION b/VERSION
index 44f1be1a..e657a8d6 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.0.9 (2012-09-21 09:37:29) stable
+Version 2.0.9 (2012-09-30 14:45:39) dev
diff --git a/applications/admin/static/js/web2py.js b/applications/admin/static/js/web2py.js
index 9a2e208c..61f45e30 100644
--- a/applications/admin/static/js/web2py.js
+++ b/applications/admin/static/js/web2py.js
@@ -39,7 +39,7 @@ function web2py_ajax_init(target) {
 
 function web2py_event_handlers() {
   var doc = jQuery(document)
-  doc.on('click', '.flash', function(e){jQuery(this).fadeOut('slow'); e.preventDefault();});
+      doc.on('click', '.flash', function(e){var t=jQuery(this); if(t.css('top')=='0px') t.slideUp('slow'); else t.fadeOut(); e.preventDefault();});
   doc.on('keyup', 'input.integer', function(){this.value=this.value.reverse().replace(/[^0-9\-]|\-(?=.)/g,'').reverse();});
   doc.on('keyup', 'input.double, input.decimal', function(){this.value=this.value.reverse().replace(/[^0-9\-\.,]|[\-](?=.)|[\.,](?=[0-9]*[\.,])/g,'').reverse();});
   var confirm_message = (typeof w2p_ajax_confirm_message != 'undefined') ? w2p_ajax_confirm_message : "Are you sure you want to delete this object?";
@@ -55,7 +55,7 @@ function web2py_event_handlers() {
 jQuery(function() {
    var flash = jQuery('.flash');
    flash.hide();
-   if(flash.html()) flash.slideDown();
+   if(flash.html()) flash.append('<span style="float:right;">&times;</span>').slideDown();
    web2py_ajax_init(document);
    web2py_event_handlers();
 });
@@ -67,20 +67,20 @@ function web2py_trap_form(action,target) {
         form.submit(function(e){
          jQuery('.flash').hide().html('');
          web2py_ajax_page('post',action,form.serialize(),target);
-	 e.preventDefault();
+         e.preventDefault();
       });
    });
 }
 
 function web2py_trap_link(target) {
     jQuery('#'+target+' a.w2p_trap').each(function(i){
-	    var link=jQuery(this);
-	    link.click(function(e) {
-		    jQuery('.flash').hide().html('');
-		    web2py_ajax_page('get',link.attr('href'),[],target);
-		    e.preventDefault();
-		});
-	});
+            var link=jQuery(this);
+            link.click(function(e) {
+                    jQuery('.flash').hide().html('');
+                    web2py_ajax_page('get',link.attr('href'),[],target);
+                    e.preventDefault();
+                });
+        });
 }
 
 function web2py_ajax_page(method, action, data, target) {
@@ -101,9 +101,9 @@ function web2py_ajax_page(method, action, data, target) {
       web2py_trap_link(target);
       web2py_ajax_init('#'+target);
       if(command)
-	  eval(decodeURIComponent(command));
+          eval(decodeURIComponent(command));
       if(flash)
-	  jQuery('.flash').html(decodeURIComponent(flash)).slideDown();
+          jQuery('.flash').html(decodeURIComponent(flash)).slideDown();
     }
   });
 }
@@ -151,11 +151,11 @@ function web2py_component(action, target, timeout, times){
         }
     } else {
         // run once (no timeout specified)
-	element.reload_counter = Infinity;
+        element.reload_counter = Infinity;
         web2py_ajax_page('get', action, null, target);
     } }); }
 
-function web2py_comet(url,onmessage,onopen,onclose) {
+function web2py_websocket(url,onmessage,onopen,onclose) {
   if ("WebSocket" in window) {
     var ws = new WebSocket(url);
     ws.onopen = onopen?onopen:(function(){});
@@ -165,3 +165,38 @@ function web2py_comet(url,onmessage,onopen,onclose) {
   } else return false; // not supported
 }
 
+
+function web2py_calc_entropy(mystring) {
+    //calculate a simple entropy for a given string
+    var csets = new Array(
+      'abcdefghijklmnopqrstuvwxyz', 'ABCDEFGHIJKLMNOPQRSTUVWXYZ',
+      '0123456789', '!@#$\%^&*()', '~`-_=+[]{}\|;:\'",.<>?/',
+      '0123456789abcdefghijklmnopqrstuvwxyz');
+    var score = 0, other = {}, seen = {}, lastset = null, mystringlist = mystring.split('');
+    for (var i=0;i<mystringlist.length;i++) { // classify this character
+        var c = mystringlist[i], inset=5;
+        for(var j = 0; j<csets.length; j++)
+          if (csets[j].indexOf(c) != -1) {inset = j; break;}
+        //calculate effect of character on alphabet size       
+        if(!(inset in seen)) {seen[inset] = 1;score += csets[inset].length;}
+        else if (!(c in other)) {score += 1;other[c] = 1;}
+        if (inset != lastset) {score += 1;lastset = inset;}
+    }
+    var entropy = mystring.length*Math.log(score)/0.6931471805599453;
+    return Math.round(entropy*100)/100
+}
+
+function web2py_validate_entropy(myfield, req_entropy) {
+    var validator = function () {
+        var v = (web2py_calc_entropy(myfield.val())||0)/req_entropy;
+        var r=0,g=0,b=0,rs=function(x){return Math.round(x*15).toString(16)};
+	if(v<=0.5) {r=1.0; g=2.0*v;}
+	else {r=(1.0-2.0*(Math.max(v,0)-0.5)); g=1.0;}
+	var color = '#'+rs(r)+rs(g)+rs(b);
+        myfield.css('background-color',color);
+	entropy_callback = myfield.data('entropy_callback');
+	if(entropy_callback) entropy_callback(v);
+    }
+    if(!myfield.hasClass('entropy_check')) myfield.on('keyup', validator).on('keydown', validator).addClass('entropy_check');
+}
+
diff --git a/applications/examples/static/js/web2py.js b/applications/examples/static/js/web2py.js
index 9a2e208c..61f45e30 100644
--- a/applications/examples/static/js/web2py.js
+++ b/applications/examples/static/js/web2py.js
@@ -39,7 +39,7 @@ function web2py_ajax_init(target) {
 
 function web2py_event_handlers() {
   var doc = jQuery(document)
-  doc.on('click', '.flash', function(e){jQuery(this).fadeOut('slow'); e.preventDefault();});
+      doc.on('click', '.flash', function(e){var t=jQuery(this); if(t.css('top')=='0px') t.slideUp('slow'); else t.fadeOut(); e.preventDefault();});
   doc.on('keyup', 'input.integer', function(){this.value=this.value.reverse().replace(/[^0-9\-]|\-(?=.)/g,'').reverse();});
   doc.on('keyup', 'input.double, input.decimal', function(){this.value=this.value.reverse().replace(/[^0-9\-\.,]|[\-](?=.)|[\.,](?=[0-9]*[\.,])/g,'').reverse();});
   var confirm_message = (typeof w2p_ajax_confirm_message != 'undefined') ? w2p_ajax_confirm_message : "Are you sure you want to delete this object?";
@@ -55,7 +55,7 @@ function web2py_event_handlers() {
 jQuery(function() {
    var flash = jQuery('.flash');
    flash.hide();
-   if(flash.html()) flash.slideDown();
+   if(flash.html()) flash.append('<span style="float:right;">&times;</span>').slideDown();
    web2py_ajax_init(document);
    web2py_event_handlers();
 });
@@ -67,20 +67,20 @@ function web2py_trap_form(action,target) {
         form.submit(function(e){
          jQuery('.flash').hide().html('');
          web2py_ajax_page('post',action,form.serialize(),target);
-	 e.preventDefault();
+         e.preventDefault();
       });
    });
 }
 
 function web2py_trap_link(target) {
     jQuery('#'+target+' a.w2p_trap').each(function(i){
-	    var link=jQuery(this);
-	    link.click(function(e) {
-		    jQuery('.flash').hide().html('');
-		    web2py_ajax_page('get',link.attr('href'),[],target);
-		    e.preventDefault();
-		});
-	});
+            var link=jQuery(this);
+            link.click(function(e) {
+                    jQuery('.flash').hide().html('');
+                    web2py_ajax_page('get',link.attr('href'),[],target);
+                    e.preventDefault();
+                });
+        });
 }
 
 function web2py_ajax_page(method, action, data, target) {
@@ -101,9 +101,9 @@ function web2py_ajax_page(method, action, data, target) {
       web2py_trap_link(target);
       web2py_ajax_init('#'+target);
       if(command)
-	  eval(decodeURIComponent(command));
+          eval(decodeURIComponent(command));
       if(flash)
-	  jQuery('.flash').html(decodeURIComponent(flash)).slideDown();
+          jQuery('.flash').html(decodeURIComponent(flash)).slideDown();
     }
   });
 }
@@ -151,11 +151,11 @@ function web2py_component(action, target, timeout, times){
         }
     } else {
         // run once (no timeout specified)
-	element.reload_counter = Infinity;
+        element.reload_counter = Infinity;
         web2py_ajax_page('get', action, null, target);
     } }); }
 
-function web2py_comet(url,onmessage,onopen,onclose) {
+function web2py_websocket(url,onmessage,onopen,onclose) {
   if ("WebSocket" in window) {
     var ws = new WebSocket(url);
     ws.onopen = onopen?onopen:(function(){});
@@ -165,3 +165,38 @@ function web2py_comet(url,onmessage,onopen,onclose) {
   } else return false; // not supported
 }
 
+
+function web2py_calc_entropy(mystring) {
+    //calculate a simple entropy for a given string
+    var csets = new Array(
+      'abcdefghijklmnopqrstuvwxyz', 'ABCDEFGHIJKLMNOPQRSTUVWXYZ',
+      '0123456789', '!@#$\%^&*()', '~`-_=+[]{}\|;:\'",.<>?/',
+      '0123456789abcdefghijklmnopqrstuvwxyz');
+    var score = 0, other = {}, seen = {}, lastset = null, mystringlist = mystring.split('');
+    for (var i=0;i<mystringlist.length;i++) { // classify this character
+        var c = mystringlist[i], inset=5;
+        for(var j = 0; j<csets.length; j++)
+          if (csets[j].indexOf(c) != -1) {inset = j; break;}
+        //calculate effect of character on alphabet size       
+        if(!(inset in seen)) {seen[inset] = 1;score += csets[inset].length;}
+        else if (!(c in other)) {score += 1;other[c] = 1;}
+        if (inset != lastset) {score += 1;lastset = inset;}
+    }
+    var entropy = mystring.length*Math.log(score)/0.6931471805599453;
+    return Math.round(entropy*100)/100
+}
+
+function web2py_validate_entropy(myfield, req_entropy) {
+    var validator = function () {
+        var v = (web2py_calc_entropy(myfield.val())||0)/req_entropy;
+        var r=0,g=0,b=0,rs=function(x){return Math.round(x*15).toString(16)};
+	if(v<=0.5) {r=1.0; g=2.0*v;}
+	else {r=(1.0-2.0*(Math.max(v,0)-0.5)); g=1.0;}
+	var color = '#'+rs(r)+rs(g)+rs(b);
+        myfield.css('background-color',color);
+	entropy_callback = myfield.data('entropy_callback');
+	if(entropy_callback) entropy_callback(v);
+    }
+    if(!myfield.hasClass('entropy_check')) myfield.on('keyup', validator).on('keydown', validator).addClass('entropy_check');
+}
+
diff --git a/applications/examples/views/default/who.html b/applications/examples/views/default/who.html
index cc0f4d17..64eef3bf 100644
--- a/applications/examples/views/default/who.html
+++ b/applications/examples/views/default/who.html
@@ -70,6 +70,7 @@
 </li><li>Ian Reinhart Geiser (html helpers)
 </li><li>Ionel Anton (Romanian translation)
 </li><li>Jan Beilicke (markmin)
+</li><li>Jeremy Dillworth
 </li><li>Jonathan Benn (is_url validator and tests)
 </li><li>Jonathan Lundell (multiple contributions)
 </li><li>Josh Goldfoot (xaml/html sanitizer)
@@ -156,6 +157,7 @@
 <li><a href="http://www.danga.com/memcached/">memcache</a> developed by Evan Martin</li>
 <li><a href="http://jquery.com/">jQuery</a> developed by John Resig</li>
 <li>A syntax highlighter inspired by the code of <a href="http://www.petersblog.org/node/763">Peter Wilkinson</a></li>
+<li><a href="https://github.com/jtauber/pyuca">pyUCA</a> developed by <a href="http://jtauber.com/blog/2006/01/27/python_unicode_collation_algorithm/">James Tauber</a></li>
 
       </ul>
 
diff --git a/applications/welcome/models/db.py b/applications/welcome/models/db.py
index 26d28122..54a0b231 100644
--- a/applications/welcome/models/db.py
+++ b/applications/welcome/models/db.py
@@ -11,7 +11,7 @@
 
 if not request.env.web2py_runtime_gae:
     ## if NOT running on Google App Engine use SQLite or other DB
-    db = DAL('sqlite://storage.sqlite')
+    db = DAL('sqlite://storage.sqlite')    
 else:
     ## connect to Google BigTable (optional 'google:datastore://namespace')
     db = DAL('google:datastore')
diff --git a/applications/welcome/static/css/web2py.css b/applications/welcome/static/css/web2py.css
index ac04a0f0..1ad43fd0 100644
--- a/applications/welcome/static/css/web2py.css
+++ b/applications/welcome/static/css/web2py.css
@@ -61,7 +61,7 @@ input[type=text],input[type=password],select{width:300px; margin-right:5px}
     border-top:1px #DEDEDE solid;
 }
 .header {
-	// background:<fill here for header image>;
+	/* background:<fill here for header image>; */
 }
 
 
@@ -182,7 +182,7 @@ div.error {
 * will look better with the declarations below
 * if needed to remove base.css consider keeping these following lines in some css file.
 */
-// .web2py_table {border:1px solid #ccc}
+/* .web2py_table {border:1px solid #ccc} */
 .web2py_paginator {}
 .web2py_grid {width:100%}
 .web2py_grid table {width:100%}
diff --git a/applications/welcome/static/css/web2py_bootstrap.css b/applications/welcome/static/css/web2py_bootstrap.css
index 36e9bf0e..ad3e8385 100644
--- a/applications/welcome/static/css/web2py_bootstrap.css
+++ b/applications/welcome/static/css/web2py_bootstrap.css
@@ -1,8 +1,8 @@
-//=======================================================
-//                   CUSTOM RULES 
-//=======================================================
+/*=============================================================
+                       CUSTOM RULES 
+==============================================================*/
 
-body{height:auto;} // to avoid vertical scroll bar 
+body{height:auto;} /* to avoid vertical scroll bar */
 div.flash.flash-center{left:25%;right:25%;}
 div.flash.flash-top,div.flash.flash-top:hover{
   position:relative;
@@ -36,18 +36,16 @@ div.flash.flash-top,div.flash.flash-top:hover{
   font-size:20px;
   font-weight:300;
 }
-// auth navbar - primitive style
+/* auth navbar - primitive style */
 .auth_navbar,.auth_navbar a{color:inherit;}
-.ie-lte7 .auth_navbar,.auth_navbar a{color:expression(this.parentNode.currentStyle['color']); // ie7 doesn't support inherit
-}
-.auth_navbar a{white-space:nowrap;} // to avoid the nav split on more lines
+.ie-lte7 .auth_navbar,.auth_navbar a{color:expression(this.parentNode.currentStyle['color']); /* ie7 doesn't support inherit */}
+.auth_navbar a{white-space:nowrap;} /* to avoid the nav split on more lines */ 
 .auth_navbar a:hover{color:white;text-decoration:none;}
 ul#navbar>.auth_navbar{
   display:inline-block;
   padding:5px;
 }
-
-// form errors message box customization
+/* form errors message box customization */
 div.error_wrapper{margin-bottom:9px;}
 div.error{
   border-radius: 4px;
@@ -55,9 +53,8 @@ div.error{
   -moz-border-radius: 4px;
   -webkit-border-radius: 4px;  
 }
-
-// below rules are only for formstyle = bootstrap
-// trying to make errors look like bootstrap ones
+/* below rules are only for formstyle = bootstrap
+trying to make errors look like bootstrap ones */
 div.controls .error_wrapper{
   display:inline-block;
   margin-bottom:0;
@@ -70,46 +67,44 @@ div.controls .error{
   border:none;
   padding:0;
   margin:0;
-  //display:inline; // uncommenting this, the animation effect is lost 
+  //display:inline; /* uncommenting this, the animation effect is lost */
 }
 div.controls .inline-help{color:#3A87AD;}
 div.controls .error_wrapper+.inline-help{margin-left:-99999px;}
-
-// beautify brand
+/* beautify brand */
 .navbar-inverse .brand{color:#c6cecc;}
 .navbar-inverse .brand b{display:inline-block;margin-top:-1px;}
 .navbar-inverse .brand b>span{font-size:22px;color:white}
 .navbar-inverse .brand:hover b>span{color:white}
-// beautify web2py link in navbar
+/* beautify web2py link in navbar */
 span.highlighted{color:#d8d800;}
 .open span.highlighted{color:#ffff00;}
 
-//===========================================================
-//              OVERRIDING WEB2PY.CSS RULES
-//===========================================================
+/*=============================================================
+                 OVERRIDING WEB2PY.CSS RULES
+==============================================================*/
 
-// reset to default 
+/* reset to default */
 a{white-space:normal;}
 li{margin-bottom:0;}
 textarea,button{display:block;}
-// reset ul padding
+/*reset ul padding */
 ul#navbar{padding:0;} 
-// label aligned to related input
+/* label aligned to related input */
 td.w2p_fl,td.w2p_fc {padding:0;}
 #web2py_user_form td{vertical-align:middle;}
 
-//==========================================================
-//             OVERRIDING BOOTSTRAP.CSS RULES 
-//==========================================================
+/*=============================================================
+                 OVERRIDING BOOTSTRAP.CSS RULES 
+==============================================================*/
 
-// because web2py handles this via js
+/* because web2py handles this via js */
 .hidden{visibility:visible;}
-
-// right folder for bootstrap black images/icons 
+/* right folder for bootstrap black images/icons */
 [class^="icon-"],[class*=" icon-"]{
   background-image:url("../images/glyphicons-halflings.png")
 }
-// right folder for bootstrap white images/icons 
+/* right folder for bootstrap white images/icons */
 .icon-white,
 .nav-tabs > .active > a > [class^="icon-"],
 .nav-tabs > .active > a > [class*=" icon-"],
@@ -125,20 +120,20 @@ td.w2p_fl,td.w2p_fc {padding:0;}
 .dropdown-menu > .active > a > [class*=" icon-"] {
   background-image:url("../images/glyphicons-halflings-white.png");
 }
-// bootstrap has a label as input's wrapper while web2py has a div
+/* bootstrap has a label as input's wrapper while web2py has a div */
 div>input[type="radio"],div>input[type="checkbox"]{margin:0;}
-// bootstrap has button instead of input 
+/* bootstrap has button instead of input */
 input[type="button"], input[type="submit"]{margin-right:8px;}
 
-//===========================================================
-// SOLVING CONFLICTS BETWEEN WEB2PY.CSS AND BOOTSTRAP.CSS
-//===========================================================
+/*=============================================================
+RULES FOR SOLVING CONFLICTS BETWEEN WEB2PY.CSS AND BOOTSTRAP.CSS
+==============================================================*/
 
-// when formstyle=table3cols
+/*when formstyle=table3cols*/
 tr#auth_user_remember__row>td.w2p_fw>div{padding-bottom:8px;}
 td.w2p_fw div>label{vertical-align:middle;}
 td.w2p_fc {padding-bottom:5px;}
-// when formstyle=divs
+/*when formstyle=divs*/
 div#auth_user_remember__row{margin-top:4px;}
 div#auth_user_remember__row>.w2p_fl{display:none;}
 div#auth_user_remember__row>.w2p_fw{min-height:39px;}
@@ -151,8 +146,7 @@ div.w2p_fc{
   padding-left:5px;
   margin-top:-8px;
 }
-
-// when formstyle=ul
+/*when formstyle=ul*/
 form>ul{
   list-style:none;
   margin:0;
@@ -160,30 +154,28 @@ form>ul{
 li#auth_user_remember__row{margin-top:4px;}
 li#auth_user_remember__row>.w2p_fl{display:none;}
 li#auth_user_remember__row>.w2p_fw{min-height:39px;}
-
-// when formstyle=bootstrap
+/*when formstyle=bootstrap*/
 #auth_user_remember__row  label.checkbox{display:block;}
 span.inline-help{display:inline-block;}
 input[type="text"].input-xlarge,input[type="password"].input-xlarge{width:270px;}
-
-// when recaptcha is used
+/*when recaptcha is used*/
 #recaptcha{min-height:30px;display:inline-block;margin-bottom:0;line-height:30px;vertical-align:middle;}
 td>#recaptcha{margin-bottom:6px;}
 div>#recaptcha{margin-bottom:9px;}
 
-//==========================================================
-//                     OTHER RULES
-//==========================================================
+/*=============================================================
+                       OTHER RULES
+==============================================================*/
 
 .navbar-inner{
-  position:relative; // unnecessary 
+  position:relative; /*unnecessary ??*/
 }
-
-// fixed alignment in forms with list:string
+/* Massimo Di Pierro fixed alignment in forms with list:string */
 form table tr{margin-bottom:9px;}
 td.w2p_fw ul{margin-left:0px;}
 
-// web2py_console in grid and smartgrid
+/* web2py_console in grid and smartgrid */
+.hidden{visibility:visible;}
 .web2py_console input{
   display: inline-block;
   margin-bottom: 0;
@@ -203,12 +195,12 @@ td.w2p_fw ul{margin-left:0px;}
   margin:3px 0 0 2px;
 }
 .web2py_grid form table{width:auto;}
-// auth_user_remember checkbox extrapadding in IE fix
+/* auth_user_remember checkbox extrapadding in IE fix */
 .ie-lte9 input#auth_user_remember.checkbox {padding-left:0;}
 
-//===========================================================
-//                   MEDIA QUERIES
-//===========================================================
+/*=============================================================
+                       MEDIA QUERIES
+==============================================================*/
 
 @media only screen and (max-width:979px){
   body{padding-top:0px;}
diff --git a/applications/welcome/static/images/google-buzz.png b/applications/welcome/static/images/google-buzz.png
deleted file mode 100644
index 844d5412..00000000
Binary files a/applications/welcome/static/images/google-buzz.png and /dev/null differ
diff --git a/applications/welcome/static/images/gplus-32.png b/applications/welcome/static/images/gplus-32.png
new file mode 100644
index 00000000..c42eab78
Binary files /dev/null and b/applications/welcome/static/images/gplus-32.png differ
diff --git a/applications/welcome/static/js/share.js b/applications/welcome/static/js/share.js
index ab0bcf1b..5e9d2c26 100644
--- a/applications/welcome/static/js/share.js
+++ b/applications/welcome/static/js/share.js
@@ -21,8 +21,8 @@ jQuery(function(){
 	var title = escape(jQuery('title').text());
 	var twit = 'http://twitter.com/home?status='+title+'%20'+url;
 	var facebook = 'http://www.facebook.com/sharer.php?u='+url;
-	var buzz = 'https://plus.google.com/share?url='+url;
-	var tbar = '<div id="socialdrawer"><span>Share<br/></span><div id="sicons"><a href="'+twit+'" id="twit" title="Share on twitter"><img src="'+path+'/twitter.png"  alt="Share on Twitter" width="32" height="32" /></a><a href="'+facebook+'" id="facebook" title="Share on Facebook"><img src="'+path+'/facebook.png"  alt="Share on facebook" width="32" height="32" /></a><a href="'+buzz+'" id="buzz" title="Share on Buzz"><img src="'+path+'/google-buzz.png"  alt="Share on Buzz" width="32" height="32" /></a></div></div>';	
+	var gplus = 'https://plus.google.com/share?url='+url;
+	var tbar = '<div id="socialdrawer"><span>Share<br/></span><div id="sicons"><a href="'+twit+'" id="twit" title="Share on twitter"><img src="'+path+'/twitter.png"  alt="Share on Twitter" width="32" height="32" /></a><a href="'+facebook+'" id="facebook" title="Share on Facebook"><img src="'+path+'/facebook.png"  alt="Share on facebook" width="32" height="32" /></a><a href="'+gplus+'" id="gplus" title="Share on Google Plus"><img src="'+path+'/gplus-32.png"  alt="Share on Google Plus" width="32" height="32" /></a></div></div>';	
 	// Add the share tool bar.
 	jQuery('body').append(tbar); 
 	var st = jQuery('#socialdrawer');
diff --git a/applications/welcome/static/js/web2py.js b/applications/welcome/static/js/web2py.js
index 4bcb2063..61f45e30 100644
--- a/applications/welcome/static/js/web2py.js
+++ b/applications/welcome/static/js/web2py.js
@@ -67,20 +67,20 @@ function web2py_trap_form(action,target) {
         form.submit(function(e){
          jQuery('.flash').hide().html('');
          web2py_ajax_page('post',action,form.serialize(),target);
-	 e.preventDefault();
+         e.preventDefault();
       });
    });
 }
 
 function web2py_trap_link(target) {
     jQuery('#'+target+' a.w2p_trap').each(function(i){
-	    var link=jQuery(this);
-	    link.click(function(e) {
-		    jQuery('.flash').hide().html('');
-		    web2py_ajax_page('get',link.attr('href'),[],target);
-		    e.preventDefault();
-		});
-	});
+            var link=jQuery(this);
+            link.click(function(e) {
+                    jQuery('.flash').hide().html('');
+                    web2py_ajax_page('get',link.attr('href'),[],target);
+                    e.preventDefault();
+                });
+        });
 }
 
 function web2py_ajax_page(method, action, data, target) {
@@ -101,9 +101,9 @@ function web2py_ajax_page(method, action, data, target) {
       web2py_trap_link(target);
       web2py_ajax_init('#'+target);
       if(command)
-	  eval(decodeURIComponent(command));
+          eval(decodeURIComponent(command));
       if(flash)
-	  jQuery('.flash').html(decodeURIComponent(flash)).slideDown();
+          jQuery('.flash').html(decodeURIComponent(flash)).slideDown();
     }
   });
 }
@@ -151,11 +151,11 @@ function web2py_component(action, target, timeout, times){
         }
     } else {
         // run once (no timeout specified)
-	element.reload_counter = Infinity;
+        element.reload_counter = Infinity;
         web2py_ajax_page('get', action, null, target);
     } }); }
 
-function web2py_comet(url,onmessage,onopen,onclose) {
+function web2py_websocket(url,onmessage,onopen,onclose) {
   if ("WebSocket" in window) {
     var ws = new WebSocket(url);
     ws.onopen = onopen?onopen:(function(){});
@@ -165,3 +165,38 @@ function web2py_comet(url,onmessage,onopen,onclose) {
   } else return false; // not supported
 }
 
+
+function web2py_calc_entropy(mystring) {
+    //calculate a simple entropy for a given string
+    var csets = new Array(
+      'abcdefghijklmnopqrstuvwxyz', 'ABCDEFGHIJKLMNOPQRSTUVWXYZ',
+      '0123456789', '!@#$\%^&*()', '~`-_=+[]{}\|;:\'",.<>?/',
+      '0123456789abcdefghijklmnopqrstuvwxyz');
+    var score = 0, other = {}, seen = {}, lastset = null, mystringlist = mystring.split('');
+    for (var i=0;i<mystringlist.length;i++) { // classify this character
+        var c = mystringlist[i], inset=5;
+        for(var j = 0; j<csets.length; j++)
+          if (csets[j].indexOf(c) != -1) {inset = j; break;}
+        //calculate effect of character on alphabet size       
+        if(!(inset in seen)) {seen[inset] = 1;score += csets[inset].length;}
+        else if (!(c in other)) {score += 1;other[c] = 1;}
+        if (inset != lastset) {score += 1;lastset = inset;}
+    }
+    var entropy = mystring.length*Math.log(score)/0.6931471805599453;
+    return Math.round(entropy*100)/100
+}
+
+function web2py_validate_entropy(myfield, req_entropy) {
+    var validator = function () {
+        var v = (web2py_calc_entropy(myfield.val())||0)/req_entropy;
+        var r=0,g=0,b=0,rs=function(x){return Math.round(x*15).toString(16)};
+	if(v<=0.5) {r=1.0; g=2.0*v;}
+	else {r=(1.0-2.0*(Math.max(v,0)-0.5)); g=1.0;}
+	var color = '#'+rs(r)+rs(g)+rs(b);
+        myfield.css('background-color',color);
+	entropy_callback = myfield.data('entropy_callback');
+	if(entropy_callback) entropy_callback(v);
+    }
+    if(!myfield.hasClass('entropy_check')) myfield.on('keyup', validator).on('keydown', validator).addClass('entropy_check');
+}
+
diff --git a/applications/welcome/static/js/web2py_bootstrap.js b/applications/welcome/static/js/web2py_bootstrap.js
new file mode 100644
index 00000000..4fe46472
--- /dev/null
+++ b/applications/welcome/static/js/web2py_bootstrap.js
@@ -0,0 +1,28 @@
+// this code improves bootstrap menus and adds dropdown support
+jQuery(function(){
+  jQuery('.nav>li>a').each(function(){
+    if(jQuery(this).parent().find('ul').length)
+      jQuery(this).attr({'class':'dropdown-toggle','data-toggle':'dropdown'}).append('<b class="caret"></b>');
+  });
+  jQuery('.nav li li').each(function(){
+    if(jQuery(this).find('ul').length)
+      jQuery(this).addClass('dropdown-submenu');
+  });
+  function hoverMenu(){
+    var wid = document.documentElement.clientWidth; //faster than $(window).width() and cross browser
+    if (wid>=980){
+        jQuery('ul.nav a.dropdown-toggle').parent().hover(function(){
+            mi = jQuery(this).addClass('open');
+            mi.children('.dropdown-menu').stop(true, true).delay(200).fadeIn(400);
+        }, function(){
+            mi = jQuery(this);
+            mi.children('.dropdown-menu').stop(true, true).delay(200).fadeOut(function(){mi.removeClass('open')});
+        });
+    };
+  }
+  hoverMenu(); // first page load
+  jQuery(window).resize(hoverMenu); // on resize event
+  jQuery('ul.nav li.dropdown a').click(function(){window.location=jQuery(this).attr('href');});
+  // make all buttons bootstrap buttons
+  jQuery('button, form input[type="submit"], form input[type="button"]').addClass('btn');
+});
diff --git a/applications/welcome/views/default/user.html b/applications/welcome/views/default/user.html
index ef00c0e6..475be5b3 100644
--- a/applications/welcome/views/default/user.html
+++ b/applications/welcome/views/default/user.html
@@ -15,92 +15,9 @@ pass
 </div>
 <script language="javascript"><!--
 jQuery("#web2py_user_form input:visible:enabled:first").focus();
-
-
-function calc_entropy(mystring) {
-    /*" calculate a simple entropy for a given string "*/
-    var lowerset = 'abcdefghijklmnopqrstuvwxyz';
-    var upperset = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ';
-    var numberset = '0123456789';
-    var sym1set = '!@#$%^&*()';
-    var sym2set = '~`-_=+[]{}\\|;:\'",.<>?/';
-    var otherset = '0123456789abcdefghijklmnopqrstuvwxyz' /*anything else*/
-    var alphabet = 0;
-    var other = {};
-    var seen = {};
-    var lastset = null;
-    var mystringlist = mystring.split('');
-    for (var i=0;i<mystringlist.length;i++) {
-        var c = mystringlist[i];
-        //console.log('we are at char', c);
-        /* classify this character*/
-        var inset = otherset;
-        while (1) {
-            /*lowerset*/
-            if (lowerset.indexOf(c) != -1) {
-                inset = lowerset;
-                break
-            };
-            /*upperset*/
-            if (upperset.indexOf(c) != -1) {
-                inset = upperset;
-                break
-            };
-            /*numberset*/
-            if (numberset.indexOf(c) != -1) {
-                inset = numberset;
-                break
-            };
-            /*sym1set*/
-            if (sym1set.indexOf(c) != -1) {
-                inset = sym1set;
-                break
-            };
-            /*sym2set*/
-            if (sym2set.indexOf(c) != -1) {
-                inset = sym2set;
-                break
-            } else {break};
-        }
-        //console.log('inset detected as', inset, seen);
-        /*calculate effect of character on alphabet size*/
-        if (!(inset in seen)) {
-            //console.log('credit for a new character set');
-            seen[inset] = 1;
-            alphabet += inset.length; /*credit for a new character set*/
-        }
-        else if (!(c in other)) {
-            //console.log('credit for unique characters');
-            alphabet += 1;
-            other[c] = 1;
-        }
-        if (inset != lastset) {
-            //console.log('credit for set transitions');
-            alphabet += 1;  /*credit for set transitions*/
-            lastset = inset;
-        }
-    }
-    var entropy = mystring.length / 1.0 * Math.log(alphabet) / 0.6931471805599453; /*math.log(2)*/
-    return Math.round(entropy*100)/100
-}
-
-function validate_entropy(myfield, midrange) {
-    var k = 256.0/midrange;
-    var validator = function () {
-            var value = calc_entropy(myfield.val());
-	    var color;
-            if(value<30) {
-                var c = Math.floor(value*k).toString(16);
-                color = '#ff'+((c.length==1)?'0':''+c)+'00';
-            } else {
-                var c = Math.floor(Math.max(0,255-(value-midrange)*k)).toString(16);
-                color = '#'+((c.length==1)?'0':'')+c+'ff00';
-	    }
-	    myfield.css('background-color',color);
-        }
-        myfield.on('keyup', validator);
-        myfield.on('keydown', validator);
-    }
-    validate_entropy(jQuery('#auth_user_password'),50);
-      //--></script>
-
+{{if request.args(0)=='register':}}
+    web2py_validate_entropy(jQuery('#auth_user_password'),100);
+{{elif request.args(0)=='change_password':}}
+    web2py_validate_entropy(jQuery('#no_table_new_password'),100);
+{{pass}}
+//--></script>
diff --git a/applications/welcome/views/layout.html b/applications/welcome/views/layout.html
index 19225730..ad0d0d9e 100644
--- a/applications/welcome/views/layout.html
+++ b/applications/welcome/views/layout.html
@@ -39,7 +39,7 @@
   <script src="{{=URL('static','js/modernizr.custom.js')}}"></script>
 
   <!-- include stylesheets -->
-  {{
+  {{  
   response.files.append(URL('static','css/web2py.css'))
   response.files.append(URL('static','css/bootstrap.min.css'))
   response.files.append(URL('static','css/bootstrap-responsive.min.css'))
@@ -71,11 +71,11 @@
     <div class="navbar-inner">
       <div class="container">
         <!-- the next tag is necessary for bootstrap menus, do not remove -->
-        <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
+        <button type="button" class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
           <span class="icon-bar"></span>
           <span class="icon-bar"></span>
           <span class="icon-bar"></span>
-        </a>
+        </button>
         <a class="brand" href="http://www.web2py.com/"><b>web<span>2</span>py</b>&trade;&nbsp;</a>
         <ul id="navbar" class="nav pull-right">{{='auth' in globals() and auth.navbar(mode="dropdown") or ''}}</ul>
         <div class="nav-collapse">
@@ -146,32 +146,8 @@
 
   <!-- The javascript =============================================
        (Placed at the end of the document so the pages load faster) -->
-  <script>
-    // this code improves bootstrap menus and adds dropdown support
-    jQuery(function(){
-      jQuery('.nav>li>a').each(function(){
-        if(jQuery(this).parent().find('ul').length)
-          jQuery(this).attr({'class':'dropdown-toggle','data-toggle':'dropdown'}).append('<b class="caret"></b>');
-      });
-      jQuery('.nav li li').each(function(){
-        if(jQuery(this).find('ul').length)
-          jQuery(this).addClass('dropdown-submenu');
-      });
-      if(jQuery(document).width()>=980) {
-       jQuery('ul.nav a.dropdown-toggle').parent().hover(function() {
-          mi = jQuery(this).addClass('open');
-          mi.children('.dropdown-menu').stop(true, true).delay(200).fadeIn(400);
-        }, function() {
-          mi = jQuery(this);
-          mi.children('.dropdown-menu').stop(true, true).delay(200).fadeOut(function(){mi.removeClass('open')});
-        });
-      }
-      jQuery('ul.nav li.dropdown a').click(function(){window.location=jQuery(this).attr('href');});
-      // make all buttons bootstrap buttons
-      jQuery('button, form input[type="submit"], form input[type="button"]').addClass('btn');
-    });
-  </script>
   <script src="{{=URL('static','js/bootstrap.min.js')}}"></script>
+  <script src="{{=URL('static','js/web2py_bootstrap.js')}}"></script>
   <!--[if lt IE 7 ]>
       <script src="{{=URL('static','js/dd_belatedpng.js')}}"></script>
       <script> DD_belatedPNG.fix('img, .png_bg'); //fix any <img> or .png_bg background-images </script>
diff --git a/gluon/contrib/login_methods/dropbox_account.py b/gluon/contrib/login_methods/dropbox_account.py
index a87d8661..42877773 100644
--- a/gluon/contrib/login_methods/dropbox_account.py
+++ b/gluon/contrib/login_methods/dropbox_account.py
@@ -2,9 +2,9 @@
 # coding: utf8
 
 """
-   Dropbox Authentication for web2py
-   Developed by Massimo Di Pierro (2012)
-   Same License as Web2py License
+Dropbox Authentication for web2py
+Developed by Massimo Di Pierro (2012)
+Same License as Web2py License
 """
 
 # mind here session is dropbox session, not current.session
@@ -27,7 +27,7 @@ class DropboxAccount(object):
               key="...",
               secret="...",
               access_type="...",
-              url = "http://localhost:8000/%s/default/user/login" % request.application)
+              login_url = "http://localhost:8000/%s/default/user/login" % request.application)
     when logged in
     client = auth.settings.login_form.client
     """
@@ -40,7 +40,7 @@ class DropboxAccount(object):
                  login_url = "",
                  on_login_failure=None,
                  ):
-
+        
         self.request=request
         self.key=key
         self.secret=secret
@@ -53,39 +53,48 @@ class DropboxAccount(object):
 
     def get_user(self):
         request = self.request
-        token = current.session.dropbox_token        
-        if not token:
-            return None
-        try:
-            self.sess.set_token(token[0],token[1])
-        except:
-            # invalid token, should never happen
+        if not current.session.dropbox_request_token:
             return None
+        elif not current.session.dropbox_access_token:
+            
+            request_token = current.session.dropbox_request_token        
+            self.sess.set_request_token(request_token[0],request_token[1])
+            access_token = self.sess.obtain_access_token(self.sess.token)
+            current.session.dropbox_access_token = \
+                (access_token.key,access_token.secret)
         else:
-            user = Storage()
-            self.client = client.DropboxClient(self.sess)
-            data = self.client.account_info()
-            display_name = data.get('display_name','').split(' ',1)
-            user = dict(email = data.get('email',None),
-                        first_name = display_name[0],
-                        last_name = display_name[-1],
-                        registration_id = data.get('uid',None))
-            if not user['registration_id'] and self.on_login_failure:
-                redirect(self.on_login_failure)
-            return user
+            access_token = current.session.dropbox_access_token
+            self.sess.set_token(access_token[0],access_token[1])
+
+        
+        user = Storage()
+        self.client = client.DropboxClient(self.sess)
+        data = self.client.account_info()
+        display_name = data.get('display_name','').split(' ',1)
+        user = dict(email = data.get('email',None),
+                    first_name = display_name[0],
+                    last_name = display_name[-1],
+                    registration_id = data.get('uid',None))
+        if not user['registration_id'] and self.on_login_failure:
+            redirect(self.on_login_failure)
+        return user
 
     def login_form(self):
-        token = self.sess.obtain_request_token()
-        current.session.dropbox_token = (token.key,token.secret)
-        dropbox_url = self.sess.build_authorize_url(token,self.login_url)
+
+        request_token = self.sess.obtain_request_token()
+        current.session.dropbox_request_token =  \
+            (request_token.key,request_token.secret)
+        dropbox_url = self.sess.build_authorize_url(request_token,
+                                                    self.login_url)
         redirect(dropbox_url)
         form = IFRAME(_src=dropbox_url,
                       _scrolling="no",
                       _frameborder="no",
                       _style="width:400px;height:240px;")
         return form
+
     def logout_url(self, next = "/"):
-        current.session.dropbox_token=None
+        current.session.dropbox_request_token=None
         current.session.auth=None
         redirect('https://www.dropbox.com/logout')
         return next
diff --git a/gluon/contrib/memcache/__init__.py b/gluon/contrib/memcache/__init__.py
index 15817bcb..68900695 100644
--- a/gluon/contrib/memcache/__init__.py
+++ b/gluon/contrib/memcache/__init__.py
@@ -26,8 +26,10 @@ class MemcacheClientObj(Client):
 
     def __init__(self, request, servers, debug=0, pickleProtocol=0,
                  pickler=pickle.Pickler, unpickler=pickle.Unpickler,
-                 pload=None, pid=None):
+                 pload=None, pid=None,
+                 default_time_expire = DEFAULT_TIME_EXPIRE):
         self.request=request
+        self.default_time_expire = time_expire
         if request:
             app = request.application
         else:
@@ -43,8 +45,9 @@ class MemcacheClientObj(Client):
         else:
             self.storage = self.meta_storage[app]
 
-    def __call__(self, key, f,
-                 time_expire=DEFAULT_TIME_EXPIRE):
+    def __call__(self, key, f, time_expire = 'default'):
+        if time_expire == 'default':
+            time_expire = self.default_time_expire
         if time_expire == None:
             time_expire = self.max_time_expire
         # this must be commented because get and set are redefined
@@ -70,8 +73,10 @@ class MemcacheClientObj(Client):
             self.set(key, (now,value), self.max_time_expire)
         return value
 
-    def increment(self, key, value=1, time_expire=DEFAULT_TIME_EXPIRE):
+    def increment(self, key, value=1, time_expire='default'):
         """ time_expire is ignored """
+        if time_expire == 'default':
+            time_expire = self.default_time_expire
         newKey = self.__keyFormat__(key)
         obj = Client.get(self, newKey)
         if obj:
@@ -86,7 +91,9 @@ class MemcacheClientObj(Client):
             Client.set(self, newKey, value, self.max_time_expire)
             return value
 
-    def set(self, key, value, time_expire=DEFAULT_TIME_EXPIRE):
+    def set(self, key, value, time_expire='default'):
+        if time_expire == 'default':
+            time_expire = self.default_time_expire
         newKey = self.__keyFormat__(key)
         return Client.set(self, newKey, value, time_expire)
 
diff --git a/gluon/contrib/minify/minify.py b/gluon/contrib/minify/minify.py
index 012c9611..5311b219 100644
--- a/gluon/contrib/minify/minify.py
+++ b/gluon/contrib/minify/minify.py
@@ -12,6 +12,7 @@ import cssmin
 import jsmin
 import os
 import hashlib
+import re
 
 def read_binary_file(filename):
     f = open(filename,'rb')
@@ -25,7 +26,8 @@ def write_binary_file(filename,data):
     f.close()
 
 def fix_links(css,static_path):
-    return css.replace('../',static_path+'../')
+    return re.sub(r'url\((["\'])\.\./', 'url(\\1' + static_path, css)
+    
     
 def minify(files, path_info, folder, optimize_css, optimize_js,
            ignore_concat = [],
@@ -60,16 +62,18 @@ def minify(files, path_info, folder, optimize_css, optimize_js,
     processed = []
     for k,filename in enumerate(files):
         if not filename.startswith('/') or \
-                any(filename.endswith(x) for x in ignore_concat):
+                any(filename.endswith(x) \
+                        for x in ignore_concat):
             new_files.append(filename)
             continue
 
-        abs_filename = os.path.join(folder,'static',
-                                    filename[len(static_path)+1:])        
+        abs_filename = os.path.join(
+            folder,'static', filename[len(static_path)+1:])
 
         if filename.lower().endswith('.css'):
             processed.append(filename)
-            spath_info, sfilename = path_info.split('/'), filename.split('/')
+            spath_info, sfilename = \
+                path_info.split('/'), filename.split('/')
             u = 0
             for i,a in enumerate(sfilename):
                 try:
@@ -80,7 +84,7 @@ def minify(files, path_info, folder, optimize_css, optimize_js,
                     pass
             if concat_css:
                 contents = read_binary_file(abs_filename)
-                replacement = '../'*len(spath_info[u:]) + '/'.join(sfilename[u:-1]) + '/'
+                replacement = '/'.join(spath_info[:u]) + '/'
                 contents = fix_links(contents, replacement)
                 if minify_css:
                     css.append(cssmin.cssmin(contents))
@@ -91,9 +95,12 @@ def minify(files, path_info, folder, optimize_css, optimize_js,
         elif filename.lower().endswith('.js'):
             processed.append(filename)
             if concat_js:
-                contents = read_binary_file(abs_filename)            
-                if minify_js and not filename.endswith('.min.js') and \
-                        not any(filename.endswith(x) for x in ignore_minify):
+                contents = read_binary_file(abs_filename)
+
+                if minify_js and \
+                        not filename.endswith('.min.js') and \
+                        not any(filename.endswith(x) \
+                                    for x in ignore_minify):
                     js.append(jsmin.jsmin(contents))
                 else:
                     js.append(contents)
@@ -104,12 +111,15 @@ def minify(files, path_info, folder, optimize_css, optimize_js,
         css = '\n\n'.join(contents for contents in css)
         if not inline_css:
             temppath = os.path.join(folder,'static',temp)
-            if not os.path.exists(temppath): os.mkdir(temppath)
+            if not os.path.exists(temppath):
+                os.mkdir(temppath)
             dest = "compressed_%s.css" % dest_key
             tempfile = os.path.join(temppath, dest)
             write_binary_file(tempfile,css)
             css = path_info+'/%s' % dest
-        new_files.append(css)
+            new_files.append(css)
+        else:
+            new_files.append(('css:inline',css))
     else:
         new_files += css
     if js and concat_js:
@@ -118,7 +128,8 @@ def minify(files, path_info, folder, optimize_css, optimize_js,
             js = ('js:inline',js)
         else:
             temppath = os.path.join(folder,'static',temp)
-            if not os.path.exists(temppath): os.mkdir(temppath)
+            if not os.path.exists(temppath): 
+                os.mkdir(temppath)
             dest = "compressed_%s.js" % dest_key
             tempfile = os.path.join(folder,'static',temp,dest)
             write_binary_file(tempfile,js)
diff --git a/gluon/contrib/pyuca/LICENSE b/gluon/contrib/pyuca/LICENSE
new file mode 100644
index 00000000..a52383bb
--- /dev/null
+++ b/gluon/contrib/pyuca/LICENSE
@@ -0,0 +1,19 @@
+# Copyright (c) 2006-2012 James Tauber and contributors
+# 
+# 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.
\ No newline at end of file
diff --git a/gluon/contrib/pyuca/README.markmin b/gluon/contrib/pyuca/README.markmin
new file mode 100644
index 00000000..c146ccf5
--- /dev/null
+++ b/gluon/contrib/pyuca/README.markmin
@@ -0,0 +1,43 @@
+# pyuca: Python Unicode Collation Algorithm implementation
+(http://jtauber.com/blog/2006/01/27/python_unicode_collation_algorithm/)
+
+This is my preliminary attempt at a Python implementation of the
+[Unicode Collation Algorithm (UCA)](http://unicode.org/reports/tr10/).
+I originally posted it to my blog in 2006 but it seems to get enough
+usage it really belongs here (and in PyPI).
+
+What do you use it for? In short, sorting non-English strings properly.
+
+The core of the algorithm involves multi-level comparison. For example,
+``café`` comes before ``caff`` because at the primary level, the accent
+is ignored and the first word is treated as if it were ``cafe``.
+The secondary level (which considers accents) only applies then to words
+that are equivalent at the primary level.
+
+The Unicode Collation Algorithm and pyuca also support contraction and
+expansion. **Contraction** is where multiple letters are treated as a
+single unit. In Spanish, ``ch`` is treated as a letter coming between
+``c`` and ``d`` so that, for example, words beginning ``ch`` should
+sort after all other words beginnings with ``c``. **Expansion** is where
+a single letter is treated as though it were multiple letters. In German,
+``ä`` is sorted as if it were ``ae``, i.e. after ``ad`` but before ``af``.
+
+## Here is how to use the ``pyuca`` module:
+``
+git clone https://github.com/jtauber/pyuca.git
+cd pyuca
+pip install pyuca
+``
+
+**Usage example:**
+``
+    from pyuca import Collator
+    c = Collator("allkeys.txt")
+    
+    sorted_words = sorted(words, key=c.sort_key)
+``
+
+``allkeys.txt`` (1 MB) is available at
+
+http://www.unicode.org/Public/UCA/latest/allkeys.txt
+
diff --git a/gluon/contrib/pyuca/__init__.py b/gluon/contrib/pyuca/__init__.py
index 0aca262b..96d06196 100644
--- a/gluon/contrib/pyuca/__init__.py
+++ b/gluon/contrib/pyuca/__init__.py
@@ -1,5 +1,10 @@
 import os
 import pyuca
 
-unicode_collator = pyuca.Collator(os.path.join(os.path.dirname(__file__), 'allkeys.txt'))
+unicode_collator = None
 
+def set_unicode_collator(file):
+    global unicode_collator
+    unicode_collator = pyuca.Collator(file)
+
+set_unicode_collator(os.path.join(os.path.dirname(__file__), 'allkeys.txt'))
diff --git a/gluon/contrib/pyuca/pyuca.py b/gluon/contrib/pyuca/pyuca.py
index 8956f4e6..ce41fde9 100644
--- a/gluon/contrib/pyuca/pyuca.py
+++ b/gluon/contrib/pyuca/pyuca.py
@@ -1,21 +1,21 @@
 # pyuca - Unicode Collation Algorithm
-# Version: 2006-02-13
+# Version: 2012-06-21
 #
 # James Tauber
 # http://jtauber.com/
 
-# Copyright (c) 2006 James Tauber
-#
+# Copyright (c) 2006-2012 James Tauber and contributors
+# 
 # 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
@@ -28,7 +28,6 @@
 """
 Preliminary implementation of the Unicode Collation Algorithm.
 
-
 This only implements the simple parts of the algorithm but I have successfully
 tested it using the Default Unicode Collation Element Table (DUCET) to collate
 Ancient Greek correctly.
@@ -48,31 +47,39 @@ but you can always subset this for just the characters you are dealing with.
 """
 
 
-class Trie:
-
+class Node:
+    
     def __init__(self):
-        self.root = [None, {}]
+        self.value = None
+        self.children = {}
 
+
+class Trie:
+    
+    def __init__(self):
+        self.root = Node()
+    
     def add(self, key, value):
         curr_node = self.root
         for part in key:
-            curr_node = curr_node[1].setdefault(part, [None, {}])
-        curr_node[0] = value
-
+            curr_node = curr_node.children.setdefault(part, Node())
+        curr_node.value = value
+    
     def find_prefix(self, key):
         curr_node = self.root
         remainder = key
         for part in key:
-            if part not in curr_node[1]:
+            if part not in curr_node.children:
                 break
-            curr_node = curr_node[1][part]
+            curr_node = curr_node.children[part]
             remainder = remainder[1:]
-        return (curr_node[0], remainder)
+        return (curr_node.value, remainder)
 
 
 class Collator:
 
     def __init__(self, filename):
+
         self.table = Trie()
         self.load(filename)
 
@@ -85,7 +92,7 @@ class Collator:
             line = line[:line.find("#")] + "\n"
             line = line[:line.find("%")] + "\n"
             line = line.strip()
-
+            
             if line.startswith("@"):
                 pass
             else:
@@ -96,32 +103,36 @@ class Collator:
                 while True:
                     begin = x.find("[")
                     if begin == -1:
-                        break
+                        break                
                     end = x[begin:].find("]")
                     collElement = x[begin:begin+end+1]
                     x = x[begin + 1:]
-
+                    
                     alt = collElement[1]
                     chars = collElement[2:-1].split(".")
-
+                    
                     collElements.append((alt, chars))
                 integer_points = [int(ch, 16) for ch in charList]
                 self.table.add(integer_points, collElements)
-
+    
     def sort_key(self, string):
-
+        
         collation_elements = []
-
+        
         lookup_key = [ord(ch) for ch in string]
         while lookup_key:
             value, lookup_key = self.table.find_prefix(lookup_key)
             if not value:
-                # @@@
-                raise ValueError, map(hex, lookup_key)
+                # Calculate implicit weighting for CJK Ideographs
+                # contributed by David Schneider 2009-07-27
+                # http://www.unicode.org/reports/tr10/#Implicit_Weights
+                value = []
+                value.append((".", ["%X" % (0xFB40 + (lookup_key[0] >> 15)), "0020", "0002", "0001"]))
+                value.append((".", ["%X" % ((lookup_key[0] & 0x7FFF) | 0x8000), "0000", "0000", "0000"]))
+                lookup_key = lookup_key[1:]
             collation_elements.extend(value)
-
         sort_key = []
-
+        
         for level in range(4):
             if level:
                 sort_key.append(0) # level separator
@@ -129,5 +140,5 @@ class Collator:
                 ce_l = int(element[1][level], 16)
                 if ce_l:
                     sort_key.append(ce_l)
-
+        
         return tuple(sort_key)
diff --git a/gluon/contrib/comet_messaging.py b/gluon/contrib/websocket_messaging.py
similarity index 86%
rename from gluon/contrib/comet_messaging.py
rename to gluon/contrib/websocket_messaging.py
index c3f2ed35..890eb295 100644
--- a/gluon/contrib/comet_messaging.py
+++ b/gluon/contrib/websocket_messaging.py
@@ -12,18 +12,18 @@ Attention: Requires Chrome or Safari. For IE of Firefox you need https://github.
 
 2) start this app:
 
-   python gluon/contrib/comet_messaging.py -k mykey -p 8888
+   python gluon/contrib/websocket_messaging.py -k mykey -p 8888
 
 3) from any web2py app you can post messages with
 
-   from gluon.contrib.comet_messaging import comet_send
-   comet_send('http://127.0.0.1:8888','Hello World','mykey','mygroup')
+   from gluon.contrib.websocket_messaging import websocket_send
+   websocket_send('http://127.0.0.1:8888','Hello World','mykey','mygroup')
 
 4) from any template you can receive them with
 
    <script>
    $(document).ready(function(){
-      if(!web2py_comet('ws://127.0.0.1:8888/realtime/mygroup',function(e){alert(e.data)}))
+      if(!web2py_websocket('ws://127.0.0.1:8888/realtime/mygroup',function(e){alert(e.data)}))
          alert("html5 websocket not supported by your browser, try Google Chrome");
    });
    </script>
@@ -34,14 +34,14 @@ Or if you want to send json messages and store evaluated json in a var called da
    <script>
    $(document).ready(function(){
       var data;
-      web2py_comet('ws://127.0.0.1:8888/realtime/mygroup',function(e){data=eval('('+e.data+')')});
+      web2py_websocket('ws://127.0.0.1:8888/realtime/mygroup',function(e){data=eval('('+e.data+')')});
    });
    </script>
 
-- All communications between web2py and comet_messaging will be digitally signed with hmac.
-- All validation is handled on the web2py side and there is no need to modify comet_messaging.py
-- Multiple web2py instances can talk with one or more comet_messaging servers.
-- "ws://127.0.0.1:8888/realtime/" must be contain the IP of the comet_messaging server.
+- All communications between web2py and websocket_messaging will be digitally signed with hmac.
+- All validation is handled on the web2py side and there is no need to modify websocket_messaging.py
+- Multiple web2py instances can talk with one or more websocket_messaging servers.
+- "ws://127.0.0.1:8888/realtime/" must be contain the IP of the websocket_messaging server.
 - Via group='mygroup' name you can support multiple groups of clients (think of many chat-rooms)
 
 Here is a complete sample web2py action:
@@ -51,7 +51,7 @@ Here is a complete sample web2py action:
         script=SCRIPT('''
             jQuery(document).ready(function(){
               var callback=function(e){alert(e.data)};
-              if(!web2py_comet('ws://127.0.0.1:8888/realtime/mygroup',callback))
+              if(!web2py_websocket('ws://127.0.0.1:8888/realtime/mygroup',callback))
                 alert("html5 websocket not supported by your browser, try Google Chrome");
             });
         ''')
@@ -60,8 +60,8 @@ Here is a complete sample web2py action:
     def ajax_form():
         form=SQLFORM.factory(Field('message'))
         if form.accepts(request,session):
-            from gluon.contrib.comet_messaging import comet_send
-            comet_send('http://127.0.0.1:8888',form.vars.message,'mykey','mygroup')
+            from gluon.contrib.websocket_messaging import websocket_send
+            websocket_send('http://127.0.0.1:8888',form.vars.message,'mykey','mygroup')
         return form
 
 Acknowledgements:
@@ -83,7 +83,7 @@ listeners = {}
 names = {}
 tokens = {}
 
-def comet_send(url,message,hmac_key=None,group='default'):
+def websocket_send(url,message,hmac_key=None,group='default'):
     sig = hmac_key and hmac.new(hmac_key,message).hexdigest() or ''
     params = urllib.urlencode({'message': message, 'signature': sig, 'group':group})
     f = urllib.urlopen(url, params)
diff --git a/gluon/dal.py b/gluon/dal.py
index 857bcf84..d477f0c2 100644
--- a/gluon/dal.py
+++ b/gluon/dal.py
@@ -191,7 +191,6 @@ osetattr = object.__setattr__
 exists = os.path.exists
 pjoin = os.path.join
 
-
 ###################################################################################
 # following checks allow the use of dal without web2py, as a standalone module
 ###################################################################################
@@ -219,11 +218,11 @@ try:
 except ImportError:
     have_validators = False
 
-logger = logging.getLogger("web2py.dal")
+LOGGER = logging.getLogger("web2py.dal")
 DEFAULT = lambda:0
 
-sql_locker = threading.RLock()
-thread = threading.local()
+GLOBAL_LOCKER = threading.RLock()
+THREAD_LOCAL = threading.local()
 
 # internal representation of tables with field
 #  <table>.<field>, tables and fields may only be [a-zA-Z0-9_]
@@ -264,13 +263,13 @@ if not 'google' in DRIVERS:
         from pysqlite2 import dbapi2 as sqlite2
         DRIVERS.append('SQLite(sqlite2)')
     except ImportError:
-        logger.debug('no SQLite drivers pysqlite2.dbapi2')
+        LOGGER.debug('no SQLite drivers pysqlite2.dbapi2')
 
     try:
         from sqlite3 import dbapi2 as sqlite3
         DRIVERS.append('SQLite(sqlite3)')
     except ImportError:
-        logger.debug('no SQLite drivers sqlite3')
+        LOGGER.debug('no SQLite drivers sqlite3')
 
     try:
         # first try contrib driver, then from site-packages (if installed)
@@ -285,13 +284,13 @@ if not 'google' in DRIVERS:
             import pymysql
         DRIVERS.append('MySQL(pymysql)')
     except ImportError:
-        logger.debug('no MySQL driver pymysql')
+        LOGGER.debug('no MySQL driver pymysql')
 
     try:
         import MySQLdb
         DRIVERS.append('MySQL(MySQLdb)')
     except ImportError:
-        logger.debug('no MySQL driver MySQLDB')
+        LOGGER.debug('no MySQL driver MySQLDB')
 
 
     try:
@@ -299,7 +298,7 @@ if not 'google' in DRIVERS:
         from psycopg2.extensions import adapt as psycopg2_adapt
         DRIVERS.append('PostgreSQL(psycopg2)')
     except ImportError:
-        logger.debug('no PostgreSQL driver psycopg2')
+        LOGGER.debug('no PostgreSQL driver psycopg2')
 
     try:
         # first try contrib driver, then from site-packages (if installed)
@@ -309,13 +308,13 @@ if not 'google' in DRIVERS:
             import pg8000.dbapi as pg8000
         DRIVERS.append('PostgreSQL(pg8000)')
     except ImportError:
-        logger.debug('no PostgreSQL driver pg8000')
+        LOGGER.debug('no PostgreSQL driver pg8000')
 
     try:
         import cx_Oracle
         DRIVERS.append('Oracle(cx_Oracle)')
     except ImportError:
-        logger.debug('no Oracle driver cx_Oracle')
+        LOGGER.debug('no Oracle driver cx_Oracle')
 
     try:
         import pyodbc
@@ -323,53 +322,53 @@ if not 'google' in DRIVERS:
         DRIVERS.append('DB2(pyodbc)')
         DRIVERS.append('Teradata(pyodbc)')
     except ImportError:
-        logger.debug('no MSSQL/DB2/Teradata driver pyodbc')
+        LOGGER.debug('no MSSQL/DB2/Teradata driver pyodbc')
 
     try:
         import Sybase
         DRIVERS.append('Sybase(Sybase)')
     except ImportError:
-        logger.debug('no Sybase driver')
+        LOGGER.debug('no Sybase driver')
 
     try:
         import kinterbasdb
         DRIVERS.append('Interbase(kinterbasdb)')
         DRIVERS.append('Firebird(kinterbasdb)')
     except ImportError:
-        logger.debug('no Firebird/Interbase driver kinterbasdb')
+        LOGGER.debug('no Firebird/Interbase driver kinterbasdb')
 
     try:
         import fdb
         DRIVERS.append('Firbird(fdb)')
     except ImportError:
-        logger.debug('no Firebird driver fdb')
+        LOGGER.debug('no Firebird driver fdb')
 #####
     try:
         import firebirdsql
         DRIVERS.append('Firebird(firebirdsql)')
     except ImportError:
-        logger.debug('no Firebird driver firebirdsql')
+        LOGGER.debug('no Firebird driver firebirdsql')
 
     try:
         import informixdb
         DRIVERS.append('Informix(informixdb)')
-        logger.warning('Informix support is experimental')
+        LOGGER.warning('Informix support is experimental')
     except ImportError:
-        logger.debug('no Informix driver informixdb')
+        LOGGER.debug('no Informix driver informixdb')
 
     try:
         import sapdb
         DRIVERS.append('SQL(sapdb)')
-        logger.warning('SAPDB support is experimental')
+        LOGGER.warning('SAPDB support is experimental')
     except ImportError:
-        logger.debug('no SAP driver sapdb')
+        LOGGER.debug('no SAP driver sapdb')
 
     try:
         import cubriddb
         DRIVERS.append('Cubrid(cubriddb)')
-        logger.warning('Cubrid support is experimental')
+        LOGGER.warning('Cubrid support is experimental')
     except ImportError:
-        logger.debug('no Cubrid driver cubriddb')
+        LOGGER.debug('no Cubrid driver cubriddb')
 
     try:
         from com.ziclix.python.sql import zxJDBC
@@ -379,36 +378,36 @@ if not 'google' in DRIVERS:
         zxJDBC_sqlite = java.sql.DriverManager
         DRIVERS.append('PostgreSQL(zxJDBC)')
         DRIVERS.append('SQLite(zxJDBC)')
-        logger.warning('zxJDBC support is experimental')
+        LOGGER.warning('zxJDBC support is experimental')
         is_jdbc = True
     except ImportError:
-        logger.debug('no SQLite/PostgreSQL driver zxJDBC')
+        LOGGER.debug('no SQLite/PostgreSQL driver zxJDBC')
         is_jdbc = False
 
     try:
         import ingresdbi
         DRIVERS.append('Ingres(ingresdbi)')
     except ImportError:
-        logger.debug('no Ingres driver ingresdbi')
+        LOGGER.debug('no Ingres driver ingresdbi')
     # NOTE could try JDBC.......
 
     try:
         import couchdb
         DRIVERS.append('CouchDB(couchdb)')
     except ImportError:
-        logger.debug('no Couchdb driver couchdb')
+        LOGGER.debug('no Couchdb driver couchdb')
 
     try:
         import pymongo
         DRIVERS.append('MongoDB(pymongo)')
     except:
-        logger.debug('no MongoDB driver pymongo')
+        LOGGER.debug('no MongoDB driver pymongo')
 
     try:
         import imaplib
         DRIVERS.append('IMAP(imaplib)')
     except:
-        logger.debug('no IMAP driver imaplib')
+        LOGGER.debug('no IMAP driver imaplib')
 
 PLURALIZE_RULES = [
     (re.compile('child$'), re.compile('child$'), 'children'),
@@ -489,48 +488,48 @@ if 'google' in DRIVERS:
 
 class ConnectionPool(object):
 
-    pools = {}
+    POOLS = {}
     check_active_connection = True
 
     @staticmethod
     def set_folder(folder):
-        thread.folder = folder
+        THREAD_LOCAL.folder = folder
 
     # ## this allows gluon to commit/rollback all dbs in this thread
 
+    def close(self,action='commit',really=True):        
+        if action:
+            if callable(action):
+                action(self)
+            else:
+                getattr(self, action)()
+        # ## if you want pools, recycle this connection
+        if self.pool_size:
+            GLOBAL_LOCKER.acquire()
+            pool = ConnectionPool.POOLS[self.uri]
+            if len(pool) < self.pool_size:
+                pool.append(self.connection)
+                really = False
+            GLOBAL_LOCKER.release()
+        if really:
+            self.close_connection()
+        self.connection = None
+
     @staticmethod
     def close_all_instances(action):
         """ to close cleanly databases in a multithreaded environment """
-        if hasattr(thread, 'instances'):
-            while thread.instances:
-                instance = thread.instances.pop()
-                if action:
-                    if callable(action):
-                        action(instance)
-                    else:
-                        getattr(instance, action)()
-                # ## if you want pools, recycle this connection
-                really = True
-                if instance.pool_size:
-                    sql_locker.acquire()
-                    pool = ConnectionPool.pools[instance.uri]
-                    if len(pool) < instance.pool_size:
-                        pool.append(instance.connection)
-                        really = False
-                    sql_locker.release()
-                if really:
-                    getattr(instance, 'close')()
-
+        dbs = getattr(THREAD_LOCAL,'db_instances',{}).items()
+        for singleton_code, db in dbs:
+            if hasattr(db,'_adapter'):
+                db._adapter.close(action)
+            del THREAD_LOCAL.db_instances[singleton_code]
         if callable(action):
             action(None)
         return
 
     def find_or_make_work_folder(self):
         """ this actually does not make the folder. it has to be there """
-        if hasattr(thread,'folder'):
-            self.folder = thread.folder
-        else:
-            self.folder = thread.folder = ''
+        self.folder = getattr(THREAD_LOCAL,'folder','')
 
         # Creating the folder if it does not exist
         if False and self.folder and not exists(self.folder):
@@ -540,13 +539,7 @@ class ConnectionPool(object):
         """ this it is suppoed to be overloaded by adtapters"""
         pass
 
-    def reconnect(self):
-        """ allows a thread to re-connect to server or re-pool """
-        self.close_all_instances(False)
-        self.pool_connection(self._connection_function)
-        self.after_connection()
-
-    def pool_connection(self, f, cursor=True):
+    def reconnect(self, f=None, cursor=True):
         """
         this function defines: self.connection and self.cursor
         (iff cursor is True)
@@ -554,20 +547,24 @@ class ConnectionPool(object):
         if the connection is not active (closed by db server) it will loop
         if not self.pool_size or no active connections in pool makes a new one
         """
-        pools = ConnectionPool.pools
-        self._connection_function = f
+        if getattr(self,'connection',None) != None:
+            return
+        if f is None:
+            f = self.connector
+
         if not self.pool_size:
             self.connection = f()
             self.cursor = cursor and self.connection.cursor()
         else:
             uri = self.uri
+            POOLS = ConnectionPool.POOLS
             while True:
-                sql_locker.acquire()
-                if not uri in pools:
-                    pools[uri] = []
-                if pools[uri]:
-                    self.connection = pools[uri].pop()
-                    sql_locker.release()
+                GLOBAL_LOCKER.acquire()
+                if not uri in POOLS:
+                    POOLS[uri] = []
+                if POOLS[uri]:
+                    self.connection = POOLS[uri].pop()
+                    GLOBAL_LOCKER.release()
                     self.cursor = cursor and self.connection.cursor()
                     try:
                         if self.cursor and self.check_active_connection:
@@ -576,13 +573,11 @@ class ConnectionPool(object):
                     except:
                         pass
                 else:
-                    sql_locker.release()
+                    GLOBAL_LOCKER.release()
                     self.connection = f()
                     self.cursor = cursor and self.connection.cursor()
                     break
-        if not hasattr(thread,'instances'):
-            thread.instances = []
-        thread.instances.append(self)
+        self.after_connection()
 
 
 ###################################################################################
@@ -593,11 +588,13 @@ class BaseAdapter(ConnectionPool):
     driver = None
     driver_name = None
     drivers = () # list of drivers from which to pick
+    connection = None
     maxcharlength = MAXCHARLENGTH
     commit_on_alter_table = False
     support_distributed_transaction = False
     uploads_in_blob = False
     can_select_for_update = True
+
     types = {
         'boolean': 'CHAR(1)',
         'string': 'CHAR(%(length)s)',
@@ -659,7 +656,7 @@ class BaseAdapter(ConnectionPool):
         os.unlink(filename)
 
     def find_driver(self,adapter_args,uri=None):
-        if hasattr(self,'driver') and self.driver!=None:
+        if getattr(self,'driver',None) != None:
             return
         drivers_available = [driver for driver in self.drivers
                              if driver in globals()]
@@ -684,7 +681,7 @@ class BaseAdapter(ConnectionPool):
 
     def __init__(self, db,uri,pool_size=0, folder=None, db_codec='UTF-8',
                  credential_decoder=IDENTITY, driver_args={},
-                 adapter_args={}):
+                 adapter_args={},do_connect=True):
         self.db = db
         self.dbengine = "None"
         self.uri = uri
@@ -1457,8 +1454,6 @@ class BaseAdapter(ConnectionPool):
         having = args_get('having', False)
         limitby = args_get('limitby', False)
         for_update = args_get('for_update', False)
-        if not distinct is True and not distinct is False and not groupby:
-            distinct, groupby = False, distinct
         if self.can_select_for_update is False and for_update is True:
             raise SyntaxError, 'invalid select attribute: for_update'
         if distinct is True:
@@ -1557,19 +1552,22 @@ class BaseAdapter(ConnectionPool):
         return 'SELECT %s %s FROM %s%s%s;' % \
             (sql_s, sql_f, sql_t, sql_w, sql_o)
 
+    def _fetchall(self):
+        return self.cursor.fetchall()
+
     def _select_aux(self,sql,fields,attributes):
         args_get = attributes.get
         cache = args_get('cache',None)
         if not cache:
             self.execute(sql)
-            rows = self.cursor.fetchall()
+            rows = self._fetchall()
         else:
             (cache_model, time_expire) = cache
             key = self.uri + '/' + sql + '/rows'
             if len(key)>200: key = hashlib.md5(key).hexdigest()
             def _select_aux2():
                 self.execute(sql)
-                return self.cursor.fetchall()
+                return self._fetchall()
             rows = cache_model(key,_select_aux2,time_expire)
         if isinstance(rows,tuple):
             rows = list(rows)
@@ -1637,7 +1635,7 @@ class BaseAdapter(ConnectionPool):
     def rollback(self):
         return self.connection.rollback()
 
-    def close(self):
+    def close_connection(self):
         return self.connection.close()
 
     def distributed_transaction_begin(self, key):
@@ -1664,7 +1662,7 @@ class BaseAdapter(ConnectionPool):
     def log_execute(self, *a, **b):
         command = a[0]
         if self.db._debug:
-            logger.debug('SQL: %s' % command)
+            LOGGER.debug('SQL: %s' % command)
         self.db._lastsql = command
         t0 = time.time()
         ret = self.cursor.execute(*a, **b)
@@ -1948,7 +1946,7 @@ class BaseAdapter(ConnectionPool):
                                 db._referee_name % dict(
                                 table=rfield.tablename,field=rfield.name)
                             if referee_link and not referee_link in colset:
-                                colset[referee_link] = Set(db,rfield == id)
+                                colset[referee_link] = LazySet(rfield,id)
                 else:
                     if not '_extra' in new_row:
                         new_row['_extra'] = Row()
@@ -2008,6 +2006,14 @@ class BaseAdapter(ConnectionPool):
                         query = query & newquery
         return query
 
+    def CASE(self,query,t,f):
+        def represent(x):
+            types = {type(True):'boolean',type(0):'integer',type(1.0):'double'}
+            if x is None: return 'NULL'
+            elif isinstance(x,Expression): return str(x)
+            else: return self.represent(x,types.get(type(x),'string'))
+        return Expression(self.db,'CASE WHEN %s THEN %s ELSE %s END' % \
+                              (self.expand(query),represent(t),represent(f)))
 
 ###################################################################################
 # List of all the available adapters; they all extend BaseAdapter.
@@ -2046,7 +2052,7 @@ class SQLiteAdapter(BaseAdapter):
 
     def __init__(self, db, uri, pool_size=0, folder=None, db_codec ='UTF-8',
                  credential_decoder=IDENTITY, driver_args={},
-                 adapter_args={}):
+                 adapter_args={}, do_connect=True):
         self.db = db
         self.dbengine = "sqlite"
         self.uri = uri
@@ -2068,10 +2074,10 @@ class SQLiteAdapter(BaseAdapter):
             driver_args['check_same_thread'] = False
         if not 'detect_types' in driver_args:
             driver_args['detect_types'] = self.driver.PARSE_DECLTYPES
-        def connect(dbpath=dbpath, driver_args=driver_args):
+        def connector(dbpath=dbpath, driver_args=driver_args):
             return self.driver.Connection(dbpath, **driver_args)
-        self.pool_connection(connect)
-        self.after_connection()
+        self.connector = connector
+        if do_connect: self.reconnect()
 
     def after_connection(self):
         self.connection.create_function('web2py_extract', 2,
@@ -2132,10 +2138,10 @@ class SpatiaLiteAdapter(SQLiteAdapter):
             driver_args['check_same_thread'] = False
         if not 'detect_types' in driver_args:
             driver_args['detect_types'] = self.driver.PARSE_DECLTYPES
-        def connect(dbpath=dbpath, driver_args=driver_args):
+        def connector(dbpath=dbpath, driver_args=driver_args):
             return self.driver.Connection(dbpath, **driver_args)
-        self.pool_connection(connect)
-        self.after_connection()
+        self.connector = connector
+        if do_connect: self.reconnect()
 
     def after_connection(self):
         self.connection.enable_load_extension(True)
@@ -2214,7 +2220,7 @@ class JDBCSQLiteAdapter(SQLiteAdapter):
 
     def __init__(self, db, uri, pool_size=0, folder=None, db_codec='UTF-8',
                  credential_decoder=IDENTITY, driver_args={},
-                 adapter_args={}):
+                 adapter_args={}, do_connect=True):
         self.db = db
         self.dbengine = "sqlite"
         self.uri = uri
@@ -2232,12 +2238,12 @@ class JDBCSQLiteAdapter(SQLiteAdapter):
             if dbpath[0] != '/':
                 dbpath = pjoin(
                     self.folder.decode(path_encoding).encode('utf8'), dbpath)
-        def connect(dbpath=dbpath,driver_args=driver_args):
+        def connector(dbpath=dbpath,driver_args=driver_args):
             return self.driver.connect(
                 self.driver.getConnection('jdbc:sqlite:'+dbpath),
                 **driver_args)
-        self.pool_connection(connect)
-        self.after_connection()
+        self.connector = connector
+        if do_connect: self.reconnect()
 
     def after_connection(self):
         # FIXME http://www.zentus.com/sqlitejdbc/custom_functions.html for UDFs
@@ -2316,7 +2322,7 @@ class MySQLAdapter(BaseAdapter):
 
     def __init__(self,db,uri,pool_size=0,folder=None,db_codec ='UTF-8',
                  credential_decoder=IDENTITY, driver_args={},
-                 adapter_args={}):
+                 adapter_args={}, do_connect=True):
         self.db = db
         self.dbengine = "mysql"
         self.uri = uri
@@ -2352,10 +2358,10 @@ class MySQLAdapter(BaseAdapter):
                            charset=charset)
 
 
-        def connect(driver_args=driver_args):
+        def connector(driver_args=driver_args):
             return self.driver.connect(**driver_args)
-        self.pool_connection(connect)
-        self.after_connection()
+        self.connector = connector
+        if do_connect: self.reconnect()
 
     def after_connection(self):
         self.execute('SET FOREIGN_KEY_CHECKS=1;')
@@ -2442,7 +2448,7 @@ class PostgreSQLAdapter(BaseAdapter):
 
     def __init__(self,db,uri,pool_size=0,folder=None,db_codec ='UTF-8',
                  credential_decoder=IDENTITY, driver_args={},
-                 adapter_args={}, srid=4326):
+                 adapter_args={}, do_connect=True, srid=4326):
         self.db = db
         self.dbengine = "postgres"
         self.uri = uri
@@ -2480,10 +2486,10 @@ class PostgreSQLAdapter(BaseAdapter):
                    % (db, user, host, port, password)
         # choose diver according uri
         self.__version__ = "%s %s" % (self.driver.__name__, self.driver.__version__)
-        def connect(msg=msg,driver_args=driver_args):
+        def connector(msg=msg,driver_args=driver_args):
             return self.driver.connect(msg,**driver_args)
-        self.pool_connection(connect)
-        self.after_connection()
+        self.connector = connector
+        if do_connect: self.reconnect()
 
     def after_connection(self):
         self.connection.set_client_encoding('UTF8')
@@ -2668,7 +2674,7 @@ class JDBCPostgreSQLAdapter(PostgreSQLAdapter):
 
     def __init__(self,db,uri,pool_size=0,folder=None,db_codec ='UTF-8',
                  credential_decoder=IDENTITY, driver_args={},
-                 adapter_args={}):
+                 adapter_args={}, do_connect=True):
         self.db = db
         self.dbengine = "postgres"
         self.uri = uri
@@ -2695,10 +2701,10 @@ class JDBCPostgreSQLAdapter(PostgreSQLAdapter):
             raise SyntaxError, 'Database name required'
         port = m.group('port') or '5432'
         msg = ('jdbc:postgresql://%s:%s/%s' % (host, port, db), user, password)
-        def connect(msg=msg,driver_args=driver_args):
+        def connector(msg=msg,driver_args=driver_args):
             return self.driver.connect(*msg,**driver_args)
-        self.pool_connection(connect)
-        self.after_connection()
+        self.connector = connector
+        if do_connect: self.reconnect()
 
     def after_connection(self):
         self.connection.set_client_encoding('UTF8')
@@ -2793,7 +2799,7 @@ class OracleAdapter(BaseAdapter):
 
     def __init__(self,db,uri,pool_size=0,folder=None,db_codec ='UTF-8',
                  credential_decoder=IDENTITY, driver_args={},
-                 adapter_args={}):
+                 adapter_args={}, do_connect=True):
         self.db = db
         self.dbengine = "oracle"
         self.uri = uri
@@ -2805,10 +2811,10 @@ class OracleAdapter(BaseAdapter):
         ruri = uri.split('://',1)[1]
         if not 'threaded' in driver_args:
             driver_args['threaded']=True
-        def connect(uri=ruri,driver_args=driver_args):
+        def connector(uri=ruri,driver_args=driver_args):
             return self.driver.connect(uri,**driver_args)
-        self.pool_connection(connect)
-        self.after_connection()
+        self.connector = connector
+        if do_connect: self.reconnect()
 
     def after_connection(self):
         self.execute("ALTER SESSION SET NLS_DATE_FORMAT = 'YYYY-MM-DD HH24:MI:SS';")
@@ -2861,14 +2867,21 @@ class OracleAdapter(BaseAdapter):
         self.execute('SELECT %s.currval FROM dual;' % sequence_name)
         return int(self.cursor.fetchone()[0])
 
-    def parse_value(self, value, field_type, blob_decode=True):
-        if blob_decode and isinstance(value, cx_Oracle.LOB):
-            try:
-                value = value.read()
-            except self.driver.ProgrammingError:
-                # After a subsequent fetch the LOB value is not valid anymore
-                pass
-        return BaseAdapter.parse_value(self, value, field_type, blob_decode)
+    #def parse_value(self, value, field_type, blob_decode=True):
+    #    if blob_decode and isinstance(value, cx_Oracle.LOB):
+    #        try:
+    #            value = value.read()
+    #        except self.driver.ProgrammingError:
+    #            # After a subsequent fetch the LOB value is not valid anymore
+    #            pass
+    #    return BaseAdapter.parse_value(self, value, field_type, blob_decode)
+
+    def _fetchall(self):
+        if any(x[1]==cx_Oracle.CLOB for x in self.cursor.description):
+            return [tuple([(c.read() if type(c) == cx_Oracle.LOB else c) \
+                               for c in r]) for r in self.cursor]
+        else:
+            return self.cursor.fetchall()
 
 class MSSQLAdapter(BaseAdapter):
     drivers = ('pyodbc',)
@@ -2947,7 +2960,7 @@ class MSSQLAdapter(BaseAdapter):
 
     def __init__(self,db,uri,pool_size=0,folder=None,db_codec ='UTF-8',
                  credential_decoder=IDENTITY, driver_args={},
-                    adapter_args={}, fake_connect=False, srid=4326):
+                 adapter_args={}, do_connect=True, srid=4326):
         self.db = db
         self.dbengine = "mssql"
         self.uri = uri
@@ -2969,7 +2982,7 @@ class MSSQLAdapter(BaseAdapter):
                 if not dsn:
                     raise SyntaxError, 'DSN required'
             except SyntaxError, e:
-                logger.error('NdGpatch error')
+                LOGGER.error('NdGpatch error')
                 raise e
             # was cnxn = 'DSN=%s' % dsn
             cnxn = dsn
@@ -3001,11 +3014,10 @@ class MSSQLAdapter(BaseAdapter):
             urlargs = ';'.join(['%s=%s' % (ak, av) for (ak, av) in argsdict.iteritems()])
             cnxn = 'SERVER=%s;PORT=%s;DATABASE=%s;UID=%s;PWD=%s;%s' \
                 % (host, port, db, user, password, urlargs)
-        def connect(cnxn=cnxn,driver_args=driver_args):
+        def connector(cnxn=cnxn,driver_args=driver_args):
             return self.driver.connect(cnxn,**driver_args)
-        if not fake_connect:
-            self.pool_connection(connect)
-            self.after_connection()
+        self.connector = connector
+        if do_connect: self.reconnect()
 
     def lastrowid(self,table):
         #self.execute('SELECT @@IDENTITY;')
@@ -3145,7 +3157,7 @@ class SybaseAdapter(MSSQLAdapter):
 
     def __init__(self,db,uri,pool_size=0,folder=None,db_codec ='UTF-8',
                  credential_decoder=IDENTITY, driver_args={},
-                    adapter_args={}, fake_connect=False, srid=4326):
+                 adapter_args={}, do_connect=True, srid=4326):
         self.db = db
         self.dbengine = "sybase"
         self.uri = uri
@@ -3167,7 +3179,7 @@ class SybaseAdapter(MSSQLAdapter):
                 if not dsn:
                     raise SyntaxError, 'DSN required'
             except SyntaxError, e:
-                logger.error('NdGpatch error')
+                LOGGER.error('NdGpatch error')
                 raise e
         else:
             m = self.REGEX_URI.match(uri)
@@ -3191,14 +3203,12 @@ class SybaseAdapter(MSSQLAdapter):
             dsn = 'sybase:host=%s:%s;dbname=%s' % (host,port,db)
 
             driver_args.update(user = credential_decoder(user),
-                               password = credential_decoder(password),
-                               locale = charset)
+                               password = credential_decoder(password))
 
-        def connect(dsn=dsn,driver_args=driver_args):
+        def connector(dsn=dsn,driver_args=driver_args):
             return self.driver.connect(dsn,**driver_args)
-        if not fake_connect:
-            self.pool_connection(connect)
-            self.after_connection()
+        self.connector = connector
+        if do_connect: self.reconnect()
 
     def integrity_error_class(self):
         return RuntimeError # FIX THIS
@@ -3258,7 +3268,7 @@ class FireBirdAdapter(BaseAdapter):
     def select_limitby(self, sql_s, sql_f, sql_t, sql_w, sql_o, limitby):
         if limitby:
             (lmin, lmax) = limitby
-            sql_s += ' FIRST %i SKIP %i' % (lmax - lmin, lmin)
+            sql_s = ' FIRST %i SKIP %i %s' % (lmax - lmin, lmin, sql_s)
         return 'SELECT %s %s FROM %s%s%s;' % (sql_s, sql_f, sql_t, sql_w, sql_o)
 
     def _truncate(self,table,mode = ''):
@@ -3269,7 +3279,7 @@ class FireBirdAdapter(BaseAdapter):
 
     def __init__(self,db,uri,pool_size=0,folder=None,db_codec ='UTF-8',
                  credential_decoder=IDENTITY, driver_args={},
-                 adapter_args={}):
+                 adapter_args={}, do_connect=True):
         self.db = db
         self.dbengine = "firebird"
         self.uri = uri
@@ -3301,10 +3311,10 @@ class FireBirdAdapter(BaseAdapter):
                            password = credential_decoder(password),
                            charset = charset)
 
-        def connect(driver_args=driver_args):
+        def connector(driver_args=driver_args):
             return self.driver.connect(**driver_args)
-        self.pool_connection(connect)
-        self.after_connection()
+        self.connector = connector
+        if do_connect: self.reconnect()
 
     def create_sequence_and_triggers(self, query, table, **args):
         tablename = table._tablename
@@ -3328,7 +3338,7 @@ class FireBirdEmbeddedAdapter(FireBirdAdapter):
 
     def __init__(self,db,uri,pool_size=0,folder=None,db_codec ='UTF-8',
                  credential_decoder=IDENTITY, driver_args={},
-                 adapter_args={}):
+                 adapter_args={}, do_connect=True):
         self.db = db
         self.dbengine = "firebird"
         self.uri = uri
@@ -3361,11 +3371,10 @@ class FireBirdEmbeddedAdapter(FireBirdAdapter):
                            password=credential_decoder(password),
                            charset=charset)
 
-        def connect(driver_args=driver_args):
+        def connector(driver_args=driver_args):
             return self.driver.connect(**driver_args)
-        self.pool_connection(connect)
-        self.after_connection()
-
+        self.connector = connector
+        if do_connect: self.reconnect()
 
 class InformixAdapter(BaseAdapter):
     drivers = ('informixdb',)
@@ -3436,7 +3445,7 @@ class InformixAdapter(BaseAdapter):
 
     def __init__(self,db,uri,pool_size=0,folder=None,db_codec ='UTF-8',
                  credential_decoder=IDENTITY, driver_args={},
-                 adapter_args={}):
+                 adapter_args={}, do_connect=True):
         self.db = db
         self.dbengine = "informix"
         self.uri = uri
@@ -3466,10 +3475,10 @@ class InformixAdapter(BaseAdapter):
         password = credential_decoder(password)
         dsn = '%s@%s' % (db,host)
         driver_args.update(user=user,password=password,autocommit=True)
-        def connect(dsn=dsn,driver_args=driver_args):
+        def connector(dsn=dsn,driver_args=driver_args):
             return self.driver.connect(dsn,**driver_args)
-        self.pool_connection(connect)
-        self.after_connection()
+        self.connector = connector
+        if do_connect: self.reconnect()
 
     def execute(self,command):
         if command[-1:]==';':
@@ -3538,7 +3547,7 @@ class DB2Adapter(BaseAdapter):
 
     def __init__(self,db,uri,pool_size=0,folder=None,db_codec ='UTF-8',
                  credential_decoder=IDENTITY, driver_args={},
-                 adapter_args={}):
+                 adapter_args={}, do_connect=True):
         self.db = db
         self.dbengine = "db2"
         self.uri = uri
@@ -3548,10 +3557,10 @@ class DB2Adapter(BaseAdapter):
         self.db_codec = db_codec
         self.find_or_make_work_folder()
         ruri = uri.split('://', 1)[1]
-        def connect(cnxn=ruri,driver_args=driver_args):
+        def connector(cnxn=ruri,driver_args=driver_args):
             return self.driver.connect(cnxn,**driver_args)
-        self.pool_connection(connect)
-        self.after_connection()
+        self.connector = connector
+        if do_connect: self.reconnect()
 
     def execute(self,command):
         if command[-1:]==';':
@@ -3601,7 +3610,7 @@ class TeradataAdapter(BaseAdapter):
 
     def __init__(self,db,uri,pool_size=0,folder=None,db_codec ='UTF-8',
                  credential_decoder=IDENTITY, driver_args={},
-                 adapter_args={}):
+                 adapter_args={}, do_connect=True):
         self.db = db
         self.dbengine = "teradata"
         self.uri = uri
@@ -3611,10 +3620,10 @@ class TeradataAdapter(BaseAdapter):
         self.db_codec = db_codec
         self.find_or_make_work_folder()
         ruri = uri.split('://', 1)[1]
-        def connect(cnxn=ruri,driver_args=driver_args):
+        def connector(cnxn=ruri,driver_args=driver_args):
             return self.driver.connect(cnxn,**driver_args)
-        self.pool_connection(connect)
-        self.after_connection()
+        self.connector = connector
+        if do_connect: self.reconnect()
 
     def LEFT_JOIN(self):
         return 'LEFT OUTER JOIN'
@@ -3682,7 +3691,7 @@ class IngresAdapter(BaseAdapter):
 
     def __init__(self,db,uri,pool_size=0,folder=None,db_codec ='UTF-8',
                  credential_decoder=IDENTITY, driver_args={},
-                 adapter_args={}):
+                 adapter_args={}, do_connect=True):
         self.db = db
         self.dbengine = "ingres"
         self.uri = uri
@@ -3704,10 +3713,10 @@ class IngresAdapter(BaseAdapter):
                            vnode=vnode,
                            servertype=servertype,
                            trace=trace)
-        def connect(driver_args=driver_args):
+        def connector(driver_args=driver_args):
             return self.driver.connect(**driver_args)
-        self.pool_connection(connect)
-        self.after_connection()
+        self.connector = connector
+        if do_connect: self.reconnect()
 
     def create_sequence_and_triggers(self, query, table, **args):
         # post create table auto inc code (if needed)
@@ -3818,7 +3827,7 @@ class SAPDBAdapter(BaseAdapter):
 
     def __init__(self,db,uri,pool_size=0,folder=None,db_codec ='UTF-8',
                  credential_decoder=IDENTITY, driver_args={},
-                 adapter_args={}):
+                 adapter_args={}, do_connect=True):
         self.db = db
         self.dbengine = "sapdb"
         self.uri = uri
@@ -3843,12 +3852,12 @@ class SAPDBAdapter(BaseAdapter):
         db = m.group('db')
         if not db:
             raise SyntaxError, 'Database name required'
-        def connect(user=user, password=password, database=db,
+        def connector(user=user, password=password, database=db,
                     host=host, driver_args=driver_args):
             return self.driver.Connection(user, password, database,
                                           host, **driver_args)
-        self.pool_connection(connect)
-        self.after_connection()
+        self.connector = connector
+        if do_connect: self.reconnect()
 
     def lastrowid(self,table):
         self.execute("select %s.NEXTVAL from dual" % table._sequence_name)
@@ -3861,7 +3870,7 @@ class CubridAdapter(MySQLAdapter):
 
     def __init__(self, db, uri, pool_size=0, folder=None, db_codec='UTF-8',
                  credential_decoder=IDENTITY, driver_args={},
-                 adapter_args={}):
+                 adapter_args={}, do_connect=True):
         self.db = db
         self.dbengine = "cubrid"
         self.uri = uri
@@ -3891,11 +3900,11 @@ class CubridAdapter(MySQLAdapter):
         charset = m.group('charset') or 'utf8'
         user = credential_decoder(user)
         passwd = credential_decoder(password)
-        def connect(host=host,port=port,db=db,
+        def connector(host=host,port=port,db=db,
                     user=user,passwd=password,driver_args=driver_args):
             return self.driver.connect(host,port,db,user,passwd,**driver_args)
-        self.pool_connection(connect)
-        self.after_connection()
+        self.connector = connector
+        if do_connect: self.reconnect()
 
     def after_connection(self):
         self.execute('SET FOREIGN_KEY_CHECKS=1;')
@@ -3953,7 +3962,7 @@ class DatabaseStoredFile:
     def write(self,data):
         self.data += data
 
-    def close(self):
+    def close_connection(self):
         self.db.executesql("DELETE FROM web2py_filesystem WHERE path='%s'" \
                                % self.filename)
         query = "INSERT INTO web2py_filesystem(path,content) VALUES ('%s','%s')"\
@@ -3995,14 +4004,14 @@ class GoogleSQLAdapter(UseDatabaseStoredFile,MySQLAdapter):
     def __init__(self, db, uri='google:sql://realm:domain/database',
                  pool_size=0, folder=None, db_codec='UTF-8',
                  credential_decoder=IDENTITY, driver_args={},
-                 adapter_args={}):
+                 adapter_args={}, do_connect=True):
 
         self.db = db
         self.dbengine = "mysql"
         self.uri = uri
         self.pool_size = pool_size
         self.db_codec = db_codec
-        self.folder = folder or pjoin('$HOME',thread.folder.split(
+        self.folder = folder or pjoin('$HOME',THREAD_LOCAL.folder.split(
                 os.sep+'applications'+os.sep,1)[1])
         ruri = uri.split("://")[1]
         m = self.REGEX_URI.match(ruri)
@@ -4014,10 +4023,10 @@ class GoogleSQLAdapter(UseDatabaseStoredFile,MySQLAdapter):
         self.createdb = createdb = adapter_args.get('createdb',True)
         if not createdb:
             driver_args['database'] = db
-        def connect(driver_args=driver_args):
+        def connector(driver_args=driver_args):
             return rdbms.connect(**driver_args)
-        self.pool_connection(connect)
-        self.after_connection()
+        self.connector = connector
+        if do_connect: self.reconnect()
 
     def after_connection(self):
         if self.createdb:
@@ -4139,7 +4148,7 @@ class NoSQLAdapter(BaseAdapter):
         """
         pass
 
-    def close(self):
+    def close_connection(self):
         """
         remember: no transactions on many NoSQL
         """
@@ -4205,7 +4214,7 @@ class GoogleDatastoreAdapter(NoSQLAdapter):
 
     def __init__(self,db,uri,pool_size=0,folder=None,db_codec ='UTF-8',
                  credential_decoder=IDENTITY, driver_args={},
-                 adapter_args={}):
+                 adapter_args={}, do_connect=True):
         self.types.update({
                 'boolean': gae.BooleanProperty,
                 'string': (lambda: gae.StringProperty(multiline=True)),
@@ -4244,7 +4253,7 @@ class GoogleDatastoreAdapter(NoSQLAdapter):
     def create_table(self,table,migrate=True,fake_migrate=False, polymodel=None):
         myfields = {}
         for field in table:
-            if isinstance(polymodel,Table) and k in polymodel.fields():
+            if isinstance(polymodel,Table) and field.name in polymodel.fields():
                 continue
             attr = {}
             field_type = field.type
@@ -4572,7 +4581,7 @@ class GoogleDatastoreAdapter(NoSQLAdapter):
                 setattr(item, field.name, self.represent(value,field.type))
             item.put()
             counter += 1
-        logger.info(str(counter))
+        LOGGER.info(str(counter))
         return counter
 
     def insert(self,table,fields):
@@ -4664,7 +4673,7 @@ class CouchDBAdapter(NoSQLAdapter):
     def __init__(self,db,uri='couchdb://127.0.0.1:5984',
                  pool_size=0,folder=None,db_codec ='UTF-8',
                  credential_decoder=IDENTITY, driver_args={},
-                 adapter_args={}):
+                 adapter_args={}, do_connect=True):
         self.db = db
         self.uri = uri
         self.find_driver(adapter_args)
@@ -4675,10 +4684,9 @@ class CouchDBAdapter(NoSQLAdapter):
         self.pool_size = pool_size
 
         url='http://'+uri[10:]
-        def connect(url=url,driver_args=driver_args):
+        def connector(url=url,driver_args=driver_args):
             return self.driver.Server(url,**driver_args)
-        self.pool_connection(connect,cursor=False)
-        self.after_connection()
+        self.reconnect(connector,cursor=False)
 
     def create_table(self, table, migrate=True, fake_migrate=False, polymodel=None):
         if migrate:
@@ -4826,7 +4834,7 @@ class MongoDBAdapter(NoSQLAdapter):
     def __init__(self,db,uri='mongodb://127.0.0.1:5984/db',
                  pool_size=0,folder=None,db_codec ='UTF-8',
                  credential_decoder=IDENTITY, driver_args={},
-                 adapter_args={}):
+                 adapter_args={}, do_connect=True):
         self.db = db
         self.uri = uri
         self.find_driver(adapter_args)
@@ -4861,7 +4869,7 @@ class MongoDBAdapter(NoSQLAdapter):
             m = {"database" : m[1]}
         if m.get('database')==None:
             raise SyntaxError("Database is required!")
-        def connect(uri=self.uri,m=m):
+        def connector(uri=self.uri,m=m):
             try:
                 return self.driver.Connection(uri)[m.get('database')]
             except self.driver.errors.ConnectionFailure, inst:
@@ -4871,10 +4879,7 @@ class MongoDBAdapter(NoSQLAdapter):
                     raise SyntaxError("You are probebly running version 1.1 of pymongo which contains a bug which requires authentication. Update your pymongo.")
                 else:
                     raise SyntaxError("This is not an official Mongodb uri (http://www.mongodb.org/display/DOCS/Connections) Error : %s" % inst)
-        self.pool_connection(connect,cursor=False)
-        self.after_connection()
-
-
+        self.reconnect(connector,cursor=False)
 
     def represent(self, obj, fieldtype):
         value = NoSQLAdapter.represent(self, obj, fieldtype)
@@ -5054,7 +5059,7 @@ class MongoDBAdapter(NoSQLAdapter):
                 mongoqry_dict, mongofields_dict,
                 skip=limitby_skip, limit=limitby_limit,
                 sort=mongosort_list, snapshot=snapshot) # pymongo cursor object
-        print "mongo_list_dicts=%s" % mongo_list_dicts
+        # DEBUG: print "mongo_list_dicts=%s" % mongo_list_dicts
         rows = []
         ### populate row in proper order
         colnames = [field.name for field in fields]
@@ -5169,22 +5174,6 @@ class MongoDBAdapter(NoSQLAdapter):
         items = [self.expand(item, first.type) for item in second]
         return {self.expand(first) : {"$in" : items} }
 
-    def LIKE(self, first, second):
-        #escaping regex operators?
-        return {self.expand(first) : ('%s' % self.expand(second, 'string').replace('%','/'))}
-
-    def STARTSWITH(self, first, second):
-        #escaping regex operators?
-        return {self.expand(first) : ('/^%s/' % self.expand(second, 'string'))}
-
-    def ENDSWITH(self, first, second):
-        #escaping regex operators?
-        return {self.expand(first) : ('/%s^/' % self.expand(second, 'string'))}
-
-    def CONTAINS(self, first, second):
-        #There is a technical difference, but mongodb doesn't support that, but the result will be the same
-        return {self.expand(first) : ('/%s/' % self.expand(second, 'string'))}
-
     def EQ(self,first,second):
         result = {}
         #if second is None:
@@ -5194,7 +5183,6 @@ class MongoDBAdapter(NoSQLAdapter):
         return result
 
     def NE(self, first, second=None):
-        print "in NE"
         result = {}
         result[self.expand(first)] = {'$ne': self.expand(second)}
         return result
@@ -5202,7 +5190,6 @@ class MongoDBAdapter(NoSQLAdapter):
     def LT(self,first,second=None):
         if second is None:
             raise RuntimeError, "Cannot compare %s < None" % first
-        print "in LT"
         result = {}
         result[self.expand(first)] = {'$lt': self.expand(second)}
         return result
@@ -5210,13 +5197,11 @@ class MongoDBAdapter(NoSQLAdapter):
     def LE(self,first,second=None):
         if second is None:
             raise RuntimeError, "Cannot compare %s <= None" % first
-        print "in LE"
         result = {}
         result[self.expand(first)] = {'$lte': self.expand(second)}
         return result
 
     def GT(self,first,second):
-        print "in GT"
         result = {}
         result[self.expand(first)] = {'$gt': self.expand(second)}
         return result
@@ -5224,7 +5209,6 @@ class MongoDBAdapter(NoSQLAdapter):
     def GE(self,first,second=None):
         if second is None:
             raise RuntimeError, "Cannot compare %s >= None" % first
-        print "in GE"
         result = {}
         result[self.expand(first)] = {'$gte': self.expand(second)}
         return result
@@ -5258,41 +5242,30 @@ class MongoDBAdapter(NoSQLAdapter):
         raise NotImplementedError, "This is not possible in NoSQL, but can be simulated with a wrapper."
         return '%s ON %s' % (self.expand(first), self.expand(second))
 
+    #
+    # BLOW ARE TWO IMPLEMENTATIONS OF THE SAME FUNCITONS
+    # WHICH ONE IS BEST?
+    #
+
     def COMMA(self, first, second):
         return '%s, %s' % (self.expand(first), self.expand(second))
 
-    def bulk_insert(self, table, items):
-        return [self.insert(table,item) for item in items]
+    def LIKE(self, first, second):
+        #escaping regex operators?
+        return {self.expand(first) : ('%s' % self.expand(second, 'string').replace('%','/'))}
 
-    #TODO This will probably not work:(
-    def NOT(self, first):
-        result = {}
-        result["$not"] = self.expand(first)
-        return result
+    def STARTSWITH(self, first, second):
+        #escaping regex operators?
+        return {self.expand(first) : ('/^%s/' % self.expand(second, 'string'))}
 
-    def AND(self,first,second):
-        f = self.expand(first)
-        s = self.expand(second)
-        f.update(s)
-        return f
+    def ENDSWITH(self, first, second):
+        #escaping regex operators?
+        return {self.expand(first) : ('/%s^/' % self.expand(second, 'string'))}
 
-    def OR(self,first,second):
-        # pymongo expects: .find( {'$or' : [{'name':'1'}, {'name':'2'}] } )
-        result = {}
-        f = self.expand(first)
-        s = self.expand(second)
-        result['$or'] = [f,s]
-        return result
+    def CONTAINS(self, first, second):
+        #There is a technical difference, but mongodb doesn't support that, but the result will be the same
+        return {self.expand(first) : ('/%s/' % self.expand(second, 'string'))}
 
-    def BELONGS(self, first, second):
-        if isinstance(second, str):
-            return {self.expand(first) : {"$in" : [ second[:-1]]} }
-        elif second==[] or second==():
-            return {1:0}
-        items = [self.expand(item, first.type) for item in second]
-        return {self.expand(first) : {"$in" : items} }
-
-    #TODO verify full compatibilty with official SQL Like operator
     def LIKE(self, first, second):
         import re
         return {self.expand(first) : {'$regex' : re.escape(self.expand(second, 'string')).replace('%','.*')}}
@@ -5316,89 +5289,9 @@ class MongoDBAdapter(NoSQLAdapter):
         #TODO contains operators need to be transformed to Regex
         return {self.expand(first) : {' $regex' : ".*" + re.escape(self.expand(second, 'string')) + ".*"}}
 
-    def EQ(self,first,second):
-        result = {}
-        #if second is None:
-            #return '(%s == null)' % self.expand(first)
-        #return '(%s == %s)' % (self.expand(first),self.expand(second,first.type))
-        result[self.expand(first)] = self.expand(second)
-        return result
-
-    def NE(self, first, second=None):
-        print "in NE"
-        result = {}
-        result[self.expand(first)] = {'$ne': self.expand(second)}
-        return result
-
-    def LT(self,first,second=None):
-        if second is None:
-            raise RuntimeError, "Cannot compare %s < None" % first
-        print "in LT"
-        result = {}
-        result[self.expand(first)] = {'$lt': self.expand(second)}
-        return result
-
-    def LE(self,first,second=None):
-        if second is None:
-            raise RuntimeError, "Cannot compare %s <= None" % first
-        print "in LE"
-        result = {}
-        result[self.expand(first)] = {'$lte': self.expand(second)}
-        return result
-
-    def GT(self,first,second):
-        print "in GT"
-        result = {}
-        result[self.expand(first)] = {'$gt': self.expand(second)}
-        return result
-
-    def GE(self,first,second=None):
-        if second is None:
-            raise RuntimeError, "Cannot compare %s >= None" % first
-        print "in GE"
-        result = {}
-        result[self.expand(first)] = {'$gte': self.expand(second)}
-        return result
-
-    #TODO javascript has math
-    def ADD(self, first, second):
-        raise NotImplementedError, "This must yet be replaced with javascript in order to accomplish this. Sorry"
-        return '%s + %s' % (self.expand(first), self.expand(second, first.type))
-
-    #TODO javascript has math
-    def SUB(self, first, second):
-        raise NotImplementedError, "This must yet be replaced with javascript in order to accomplish this. Sorry"
-        return '(%s - %s)' % (self.expand(first), self.expand(second, first.type))
-
-    #TODO javascript has math
-    def MUL(self, first, second):
-        raise NotImplementedError, "This must yet be replaced with javascript in order to accomplish this. Sorry"
-        return '(%s * %s)' % (self.expand(first), self.expand(second, first.type))
-        #TODO javascript has math
-
-    def DIV(self, first, second):
-        raise NotImplementedError, "This must yet be replaced with javascript in order to accomplish this. Sorry"
-        return '(%s / %s)' % (self.expand(first), self.expand(second, first.type))
-    #TODO javascript has math
-    def MOD(self, first, second):
-        raise NotImplementedError, "This must yet be replaced with javascript in order to accomplish this. Sorry"
-        return '(%s %% %s)' % (self.expand(first), self.expand(second, first.type))
-
-    #TODO javascript can do this
-    def AS(self, first, second):
-        raise NotImplementedError, "This must yet be replaced with javascript in order to accomplish this. Sorry"
-        return '%s AS %s' % (self.expand(first), second)
-
-    #We could implement an option that simulates a full featured SQL database. But I think the option should be set explicit or implemented as another library.
-    def ON(self, first, second):
-        raise NotImplementedError, "This is not possible in NoSQL, but can be simulated with a wrapper."
-        return '%s ON %s' % (self.expand(first), self.expand(second))
-
-    #TODO is this used in mongodb?
-    def COMMA(self, first, second):
-        return '%s, %s' % (self.expand(first), self.expand(second))
-
-
+    #
+    # END REDUNDANCY
+    #
 
 class IMAPAdapter(NoSQLAdapter):
     drivers = ('imaplib',)
@@ -5542,7 +5435,7 @@ class IMAPAdapter(NoSQLAdapter):
                  db_codec ='UTF-8',
                  credential_decoder=IDENTITY,
                  driver_args={},
-                 adapter_args={}):
+                 adapter_args={}, do_connect=True):
 
         # db uri: user@example.com:password@imap.server.com:123
         # TODO: max size adapter argument for preventing large mail transfers
@@ -5591,7 +5484,7 @@ class IMAPAdapter(NoSQLAdapter):
             over_ssl = True
 
         driver_args.update(host=host,port=port, password=password, user=user)
-        def connect(driver_args=driver_args):
+        def connector(driver_args=driver_args):
             # it is assumed sucessful authentication alLways
             # TODO: support direct connection and login tests
             if over_ssl:
@@ -5610,10 +5503,10 @@ class IMAPAdapter(NoSQLAdapter):
             return connection
 
         self.db.define_tables = self.define_tables
-        self.pool_connection(connect)
-        # self.after_connection()
+        self.connector = connector
+        if do_connect: self.reconnect()
 
-    def pool_connection(self, f, cursor=True):
+    def reconnect(self, f, cursor=True):
         """
         IMAP4 Pool connection method
 
@@ -5623,19 +5516,24 @@ class IMAPAdapter(NoSQLAdapter):
         closing
 
         """
-        pools = ConnectionPool.pools
+        if getattr(self,'connection',None) != None:
+            return
+        if f is None:
+            f = self.connector
+
         if not self.pool_size:
             self.connection = f()
             self.cursor = cursor and self.connection.cursor()
         else:
+            POOLS = ConnectionPool.POOLS
             uri = self.uri
             while True:
-                sql_locker.acquire()
-                if not uri in pools:
-                    pools[uri] = []
-                if pools[uri]:
-                    self.connection = pools[uri].pop()
-                    sql_locker.release()
+                GLOBAL_LOCKER.acquire()
+                if not uri in POOLS:
+                    POOLS[uri] = []
+                if POOLS[uri]:
+                    self.connection = POOLS[uri].pop()
+                    GLOBAL_LOCKER.release()
                     self.cursor = cursor and self.connection.cursor()
                     if self.cursor and self.check_active_connection:
                         try:
@@ -5647,14 +5545,11 @@ class IMAPAdapter(NoSQLAdapter):
                             self.connection = f()
                     break
                 else:
-                    sql_locker.release()
+                    GLOBAL_LOCKER.release()
                     self.connection = f()
                     self.cursor = cursor and self.connection.cursor()
                     break
-
-        if not hasattr(thread,'instances'):
-            thread.instances = []
-        thread.instances.append(self)
+        self.after_connection()
 
     def get_last_message(self, tablename):
         last_message = None
@@ -5666,7 +5561,7 @@ class IMAPAdapter(NoSQLAdapter):
             result = self.connection.select(self.connection.mailbox_names[tablename])
             last_message = int(result[1][0])
         except (IndexError, ValueError, TypeError, KeyError), e:
-            logger.debug("Error retrieving the last mailbox sequence number. %s" % str(e))
+            LOGGER.debug("Error retrieving the last mailbox sequence number. %s" % str(e))
         return last_message
 
     def get_uid_bounds(self, tablename):
@@ -5698,7 +5593,7 @@ class IMAPAdapter(NoSQLAdapter):
             try:
                 dayname, datestring = date.split(",")
             except (ValueError):
-                logger.debug("Could not parse date text: %s" % date)
+                LOGGER.debug("Could not parse date text: %s" % date)
                 return None
             date_list = datestring.strip().split()
             year = int(date_list[2])
@@ -5828,7 +5723,7 @@ class IMAPAdapter(NoSQLAdapter):
 
     def create_table(self, *args, **kwargs):
         # not implemented
-        logger.debug("Create table feature is not implemented for %s" % type(self))
+        LOGGER.debug("Create table feature is not implemented for %s" % type(self))
 
     def _select(self,query,fields,attributes):
         """  Search and Fetch records and return web2py
@@ -6156,7 +6051,7 @@ class IMAPAdapter(NoSQLAdapter):
             try:
                 pedestal, threshold = self.get_uid_bounds(first.tablename)
             except TypeError, e:
-                logger.debug("Error requesting uid bounds: %s", str(e))
+                LOGGER.debug("Error requesting uid bounds: %s", str(e))
                 return ""
             try:
                 lower_limit = int(self.expand(second)) + 1
@@ -6184,7 +6079,7 @@ class IMAPAdapter(NoSQLAdapter):
             try:
                 pedestal, threshold = self.get_uid_bounds(first.tablename)
             except TypeError, e:
-                logger.debug("Error requesting uid bounds: %s", str(e))
+                LOGGER.debug("Error requesting uid bounds: %s", str(e))
                 return ""
             lower_limit = self.expand(second)
             result = "UID %s:%s" % (lower_limit, threshold)
@@ -6203,7 +6098,7 @@ class IMAPAdapter(NoSQLAdapter):
             try:
                 pedestal, threshold = self.get_uid_bounds(first.tablename)
             except TypeError, e:
-                logger.debug("Error requesting uid bounds: %s", str(e))
+                LOGGER.debug("Error requesting uid bounds: %s", str(e))
                 return ""
             try:
                 upper_limit = int(self.expand(second)) - 1
@@ -6227,7 +6122,7 @@ class IMAPAdapter(NoSQLAdapter):
             try:
                 pedestal, threshold = self.get_uid_bounds(first.tablename)
             except TypeError, e:
-                logger.debug("Error requesting uid bounds: %s", str(e))
+                LOGGER.debug("Error requesting uid bounds: %s", str(e))
                 return ""
             upper_limit = int(self.expand(second))
             result = "UID %s:%s" % (pedestal, upper_limit)
@@ -6470,6 +6365,8 @@ class Row(object):
     def __contains__(self,key):
         return key in self.__dict__
 
+    has_key = __contains__
+
     def __nonzero__(self):
         return len(self.__dict__)>0
 
@@ -6537,15 +6434,6 @@ class Row(object):
                 del d[k]
         return d
 
-def Row_unpickler(data):
-    return Row(cPickle.loads(data))
-
-def Row_pickler(data):
-    return Row_unpickler, (cPickle.dumps(data.as_dict(datetime_to_str=False)),)
-
-copy_reg.pickle(Row, Row_pickler, Row_unpickler)
-
-
 ################################################################################
 # Everything below should be independent of the specifics of the database
 # and should work for RDBMs and some NoSQL databases
@@ -6665,7 +6553,6 @@ def smart_query(fields,text):
             field = op = neg = logic = None
     return query
 
-
 class DAL(object):
 
     """
@@ -6678,6 +6565,23 @@ class DAL(object):
                                     Field('fieldname2'))
     """
 
+    def __new__(cls, uri='sqlite://dummy.db', *args, **kwargs):
+        if not hasattr(THREAD_LOCAL,'db_instances'):
+            THREAD_LOCAL.db_instances = {}
+        if 'singleton_code' in kwargs:
+            singleton_code = kwargs['singleton_code']
+            del kwargs['singleton_code']
+        singleton_code = hashlib.md5(repr(uri)).hexdigest()
+        try:
+            db = THREAD_LOCAL.db_instances[singleton_code]
+            if args or kwargs:
+                raise RuntimeError, 'Cannot duplicate a Singleton'
+        except KeyError:
+            db = super(DAL, cls).__new__(cls, uri, *args, **kwargs)
+            THREAD_LOCAL.db_instances[singleton_code] = db
+        db._singleton_code = singleton_code
+        return db
+
     @staticmethod
     def set_folder(folder):
         """
@@ -6723,7 +6627,6 @@ class DAL(object):
                 db._adapter.commit_prepared(keys[i])
         return
 
-
     def __init__(self, uri='sqlite://dummy.db',
                  pool_size=0, folder=None,
                  db_codec='UTF-8', check_reserved=None,
@@ -6731,7 +6634,8 @@ class DAL(object):
                  migrate_enabled=True, fake_migrate_all=False,
                  decode_credentials=False, driver_args=None,
                  adapter_args=None, attempts=5, auto_import=False,
-                 bigint_id=False,debug=False,lazy_tables=False):
+                 bigint_id=False,debug=False,lazy_tables=False,
+                 singleton_code=None):
         """
         Creates a new Database Abstraction Layer instance.
 
@@ -6758,6 +6662,9 @@ class DAL(object):
         :fake_migrate_all (defaults to False). If sets to True fake migrates ALL tables
         :attempts (defaults to 5). Number of times to attempt connecting
         """
+
+        if hasattr(self,'_adapter') or uri=='<lazy>': return
+
         if not decode_credentials:
             credential_decoder = lambda cred: cred
         else:
@@ -6952,9 +6859,9 @@ def index():
                     patterns.append(tag+'/:field')
                 if depth>0:
                     for f in db[table]._referenced_by:
-                        tag+='/%s[%s.%s]' % (rtable,f.tablename,f.name)
+                        tag+='/%s[%s.%s]' % (table,f.tablename,f.name)
                         patterns.append(tag)
-                        patterns += auto_table(rtable,base=tag,depth=depth-1)
+                        patterns += auto_table(table,base=tag,depth=depth-1)
             return patterns
 
         if patterns==DEFAULT:
@@ -7149,12 +7056,12 @@ def index():
                 args_get('fake_migrate',self._fake_migrate)
             polymodel = args_get('polymodel',None)
             try:
-                sql_locker.acquire()
+                GLOBAL_LOCKER.acquire()
                 self._adapter.create_table(table,migrate=migrate,
                                            fake_migrate=fake_migrate,
                                            polymodel=polymodel)
             finally:
-                sql_locker.release()
+                GLOBAL_LOCKER.release()
         else:
             table._dbt = None
         on_define = args_get('on_define',None)
@@ -7168,7 +7075,9 @@ def index():
             # The instance has no .tables attribute yet
             return False
 
-    def get(self,key,default):
+    has_key = __contains__
+
+    def get(self,key,default=None):
         return self.__dict__.get(key,default)
 
     def __iter__(self):
@@ -7217,8 +7126,8 @@ def index():
 
     def close(self):
         adapter = self._adapter
-        if adapter in thread.instances:
-            thread.instances.remove(adapter)
+        if self._singleton_code in THREAD_LOCAL.db_instances:
+            del THREAD_LOCAL.db_instances[self._singleton_code]
         adapter.close()
 
     def executesql(self, query, placeholders=None, as_dict=False,
@@ -7285,12 +7194,12 @@ def index():
             # reduce the column info down to just the field names
             fields = [f[0] for f in columns]
             # will hold our finished resultset in a list
-            data = adapter.cursor.fetchall()
+            data = adapter._fetchall()
             # convert the list for each row into a dictionary so it's
             # easier to work with. row['field_name'] rather than row[0]
             return [dict(zip(fields,row)) for row in data]
         try:
-            data = adapter.cursor.fetchall()
+            data = adapter._fetchall()
         except:
             return None
         if fields or colnames:
@@ -7348,6 +7257,14 @@ def index():
                 self[tablename].import_from_csv_file(
                     ifile, id_map, null, unique, id_offset, *args, **kwargs)
 
+def DAL_unpickler(singleton_code):
+    return DAL('<lazy>',singleton_code=singleton_code)
+
+def DAL_pickler(db):
+    return DAL_unpickler, (db._singleton_code,)
+
+copy_reg.pickle(DAL, DAL_pickler, DAL_unpickler)
+
 class SQLALL(object):
     """
     Helper class providing a comma-separated string having all the field names
@@ -7377,8 +7294,8 @@ class Reference(int):
         self.__allocate()
         return self._record.get(key, None)
 
-    def get(self, key):
-        return self.__getattr__(key)
+    def get(self, key, default=None):
+        return self.__getattr__(key, default)
 
     def __setattr__(self, key, value):
         if key.startswith('_'):
@@ -7726,6 +7643,8 @@ class Table(object):
     def __contains__(self,key):
         return hasattr(self,key)
 
+    has_key = __contains__
+
     def items(self):
         return self.__dict__.items()
 
@@ -8693,6 +8612,8 @@ class Query(object):
             return self.first
         return Query(self.db,self.db._adapter.NOT,self)
 
+    def case(self,t=1,f=0):
+        return self.db._adapter.CASE(self,t,f)
 
 
 
@@ -8904,10 +8825,12 @@ class Set(object):
 
 class RecordUpdater(object):
     def __init__(self, colset, table, id):
-        self.colset, self.table, self.id = colset, table, id
+        self.colset, self.db, self.tablename, self.id = \
+            colset, table._db, table._tablename, id
 
     def __call__(self, **fields):
-        colset, table, id = self.colset, self.table, self.id
+        colset, db, tablename, id = self.colset, self.db, self.tablename, self.id
+        table = db[tablename]
         newfields = fields or dict(colset)
         for fieldname in newfields.keys():
             if not fieldname in table.fields or table[fieldname].type=='id':
@@ -8918,10 +8841,47 @@ class RecordUpdater(object):
 
 class RecordDeleter(object):
     def __init__(self, table, id):
-        self.table, self.id = table,id
+        self.db, self.tablename, self.id = table._db, table._tablename, id
     def __call__(self):
-        return self.table._db(self.table._id==self.id).delete()
+        return self.db(self.db[self.tablename]._id==self.id).delete()
 
+class LazySet(object):
+    def __init__(self, field, id):
+        self.db, self.tablename, self.fieldname, self.id = \
+            field.db, field._tablename, field.name, id
+    def _getset(self):
+        query = self.db[self.tablename][self.fieldname]==self.id
+        return Set(self.db,query)
+    def __repr__(self):
+        return repr(self._getset())
+    def __call__(self, query, ignore_common_filters=False):
+        return self._getset()(query, ignore_common_filters)
+    def _count(self,distinct=None):
+        return self._getset()._count(distinct)
+    def _select(self, *fields, **attributes):
+        return self._getset()._select(*field,**attributes)
+    def _delete(self):
+        return self._getset()._delete()
+    def _update(self, **update_fields):
+        return self._getset()._update(**update_fields)
+    def isempty(self):
+        return self._getset().isempty()
+    def count(self,distinct=None, cache=None):
+        return self._getset().count(distinct,cache)
+    def select(self, *fields, **attributes):
+        return self._getset().select(*fields,**attributes)
+    def nested_select(self,*fields,**attributes):
+        return self._getset().nested_select(*fields,**attributes)
+    def delete(self):
+        return self._getset().delete()
+    def update(self, **update_fields):
+        return self._getset().update(**update_fields)
+    def update_naive(self, **update_fields):
+        return self._getset().update_naive(**update_fields)
+    def validate_and_update(self, **update_fields):
+        return self._getset().validate_and_update(**update_fields)
+    def delete_uploaded_files(self, upload_fields=None):
+        return self._getset().delete_uploaded_files(upload_fields)
 
 class VirtualCommand(object):
     def __init__(self,method,row):
@@ -9291,19 +9251,12 @@ class Rows(object):
         if have_serializers:
             return serializers.json(items,default=default or serializers.custom_json)
         else:
-            import simplejson
+            try:
+                import json as simplejson
+            except ImportError:
+                import gluon.contrib.simplejson as simplejson
             return simplejson.dumps(items)
 
-def Rows_unpickler(data):
-    return cPickle.loads(data)
-
-def Rows_pickler(data):
-    return Rows_unpickler, \
-        (cPickle.dumps(data.as_list(storage_to_dict=False,
-                                    datetime_to_str=False)),)
-
-copy_reg.pickle(Rows, Rows_pickler, Rows_unpickler)
-
 
 ################################################################################
 # dummy function used to define some doctests
diff --git a/gluon/globals.py b/gluon/globals.py
index ccaab79f..c40918fb 100644
--- a/gluon/globals.py
+++ b/gluon/globals.py
@@ -229,7 +229,7 @@ class Response(Storage):
             for k,v in (self.meta or {}).iteritems())
         self.write(s,escape=False)
 
-    def include_files(self):
+    def include_files(self, extensions=None):
 
         """
         Caching method for writing out files.
@@ -240,11 +240,22 @@ class Response(Storage):
         from gluon import URL
 
         files = []
+        has_js = has_css = False
         for item in self.files:
-            if not item in files: files.append(item)
-        if have_minify and (self.optimize_css or self.optimize_js):
+            if extensions and not item.split('.')[-1] in extensions:
+                continue
+            if item in files:
+                continue
+            if item.endswith('.js'):
+                has_js = True
+            if item.endswith('.css'):
+                has_css = True
+            files.append(item)
+        
+        if have_minify and ((self.optimize_css and has_css) or (self.optimize_js and has_js)):
             # cache for 5 minutes by default
             key = hashlib.md5(repr(files)).hexdigest()
+ 
             cache = self.cache_includes or (current.cache.ram, 60*5)
             def call_minify(files=files):
                 return minify.minify(files,
@@ -263,6 +274,8 @@ class Response(Storage):
         for item in files:
             if isinstance(item,str):
                 f = item.lower().split('?')[0]
+                if self.static_version:
+                    item = item.replace('/static/', '/static/_%s/' % self.static_version, 1)
                 if f.endswith('.css'):  s += css_template % item
                 elif f.endswith('.js'): s += js_template % item
                 elif f.endswith('.coffee'): s += coffee_template % item
@@ -406,11 +419,11 @@ class Response(Storage):
         BUTTON = TAG.button
         admin = URL("admin","default","design",
                     args=current.request.application)
-        from gluon.dal import thread
-        if hasattr(thread,'instances'):
+        from gluon.dal import THREAD_LOCAL
+        if hasattr(THREAD_LOCAL,'instances'):
             dbstats = [TABLE(*[TR(PRE(row[0]),'%.2fms' % (row[1]*1000)) \
                                    for row in i.db._timings]) \
-                           for i in thread.instances]
+                           for i in THREAD_LOCAL.instances]
             dbtables = dict([(regex_nopasswd.sub('******',i.uri), 
                               {'defined': 
                                sorted(list(set(i.db.tables) - 
@@ -418,7 +431,7 @@ class Response(Storage):
                                '[no defined tables]',
                                'lazy': sorted(i.db._LAZY_TABLES.keys()) or
                                '[no lazy tables]'})
-                             for i in thread.instances])
+                             for i in THREAD_LOCAL.instances])
         else:
             dbstats = [] # if no db or on GAE
             dbtables = {}
@@ -703,8 +716,3 @@ class Session(Storage):
                 del response.session_file
             except:
                 pass
-
-
-
-
-
diff --git a/gluon/html.py b/gluon/html.py
index c5bf255e..f8ab3b63 100644
--- a/gluon/html.py
+++ b/gluon/html.py
@@ -1943,6 +1943,7 @@ class FORM(DIV):
         # check formname and formkey
 
         status = True
+        changed = False
         request_vars = self.request_vars
         if session:
             formkey = session.get('_formkey[%s]' % formname, None)
@@ -1955,18 +1956,23 @@ class FORM(DIV):
             # check if editing a record that has been modified by the server
             if hasattr(self,'record_hash') and self.record_hash != formkey:
                 status = False
-                self.record_changed = True
+                self.record_changed = changed = True
         status = self._traverse(status,hideerror)
         status = self.assert_status(status, request_vars)
         if onvalidation:
             if isinstance(onvalidation, dict):
                 onsuccess = onvalidation.get('onsuccess', None)
                 onfailure = onvalidation.get('onfailure', None)
+                onchange = onvalidation.get('onchange', None)
                 if onsuccess and status:
                     onsuccess(self)
                 if onfailure and request_vars and not status:
                     onfailure(self)
                     status = len(self.errors) == 0
+                if changed:
+                    if onchange and self.record_changed and \
+                        self.detect_record_change:
+                        onchange(self)
             elif status:
                 if isinstance(onvalidation, (list, tuple)):
                     [f(self) for f in onvalidation]
@@ -2035,8 +2041,13 @@ class FORM(DIV):
         onfailure = 'flash' - will show message_onfailure in response.flash
                     None - will do nothing
                     can be a function (lambda form: pass)
+        onchange = 'flash' - will show message_onchange in response.flash
+                    None - will do nothing
+                    can be a function (lambda form: pass)
+
         message_onsuccess
         message_onfailure
+        message_onchange
         next      = where to redirect in case of success
         any other kwargs will be passed for form.accepts(...)
         """
@@ -2047,13 +2058,17 @@ class FORM(DIV):
 
         onsuccess = kwargs.get('onsuccess','flash')
         onfailure = kwargs.get('onfailure','flash')
+        onchange = kwargs.get('onchange', 'flash')
         message_onsuccess = kwargs.get('message_onsuccess',
                                        current.T("Success!"))
         message_onfailure = kwargs.get('message_onfailure',
                                        current.T("Errors in form, please check it out."))
+        message_onchange = kwargs.get('message_onchange',
+                                       current.T("Form consecutive submissions not allowed. " + 
+                                                 "Try re-submitting or refreshing the form page."))
         next = kwargs.get('next',None)
         for key in ('message_onsuccess','message_onfailure','onsuccess',
-                    'onfailure','next'):
+                    'onfailure','next', 'message_onchange', 'onchange'):
             if key in kwargs:
                 del kwargs[key]
 
@@ -2080,6 +2095,13 @@ class FORM(DIV):
             elif callable(onfailure):
                 onfailure(self)
             return False
+        elif hasattr(self, "record_changed"):
+            if self.record_changed and self.detect_record_change:
+                if onchange == 'flash':
+                    current.response.flash = message_onchange
+                elif callable(onchange):
+                    onchange(self)
+                return False
 
     def process(self, **kwargs):
         """
diff --git a/gluon/http.py b/gluon/http.py
index b42ec628..df841036 100644
--- a/gluon/http.py
+++ b/gluon/http.py
@@ -42,6 +42,7 @@ defined_status = {
     415: 'UNSUPPORTED MEDIA TYPE',
     416: 'REQUESTED RANGE NOT SATISFIABLE',
     417: 'EXPECTATION FAILED',
+    422: 'UNPROCESSABLE ENTITY',
     500: 'INTERNAL SERVER ERROR',
     501: 'NOT IMPLEMENTED',
     502: 'BAD GATEWAY',
diff --git a/gluon/main.py b/gluon/main.py
index 8d470579..459ccf89 100644
--- a/gluon/main.py
+++ b/gluon/main.py
@@ -132,7 +132,7 @@ def get_client(env):
     """
     g = regex_client.search(env.get('http_x_forwarded_for', ''))
     if g:
-        client = g.group()
+        client = (g.group() or '').split(',')[0]
     else:
         g = regex_client.search(env.get('remote_addr', ''))
         if g:
@@ -153,7 +153,10 @@ def copystream_progress(request, chunk_size= 10**5):
     if not env.content_length:
         return cStringIO.StringIO()
     source = env.wsgi_input
-    size = int(env.content_length)
+    try:
+        size = int(env.content_length)
+    except ValueError:
+        raise HTTP(400,"Invalid Content-Length header")
     dest = tempfile.TemporaryFile()
     if not 'X-Progress-ID' in request.vars:
         copystream(source, dest, size, chunk_size)
@@ -325,10 +328,12 @@ def parse_get_post_vars(request, environ):
             dpk = dpost[key]
             # if en element is not a file replace it with its value else leave it alone
             if isinstance(dpk, list):
-                if not dpk[0].filename:
-                    value = [x.value for x in dpk]
-                else:
-                    value = [x for x in dpk]
+                value = []
+                for _dpk in dpk:
+                    if not _dpk.filename:
+                        value.append(_dpk.value)
+                    else:
+                        value.append(_dpk)
             elif not dpk.filename:
                 value = dpk.value
             else:
@@ -400,7 +405,7 @@ def wsgibase(environ, responder):
                 # ##################################################
 
                 fixup_missing_path_info(environ)
-                (static_file, environ) = url_in(request, environ)
+                (static_file, version, environ) = url_in(request, environ)
                 response.status = env.web2py_status_code or response.status
 
                 if static_file:
@@ -408,24 +413,30 @@ def wsgibase(environ, responder):
                         'attachment'):
                         response.headers['Content-Disposition'] \
                             = 'attachment'
+                    if version:
+                        response.headers['Cache-Control'] = 'max-age=315360000'
+                        response.headers['Expires'] = 'Thu, 31 Dec 2037 23:59:59 GMT'
                     response.stream(static_file, request=request)
 
                 # ##################################################
                 # fill in request items
                 # ##################################################
                 app = request.application ## must go after url_in!
-                                
+
                 http_host = env.http_host.split(':',1)[0]
                 local_hosts = [http_host,'::1','127.0.0.1',
                                '::ffff:127.0.0.1']
                 if not global_settings.web2py_runtime_gae:
-                    local_hosts.append(socket.gethostname())
+                    try:
+                        local_hosts.append(socket.gethostname())
+                    except TypeError:
+                        pass
                     try:
                         local_hosts.append(
-                        socket.gethostbyname(http_host))
-                    except socket.gaierror:
+                            socket.gethostbyname(http_host))
+                    except (socket.gaierror,TypeError):
                         pass
-                client = get_client(env)                
+                client = get_client(env)
                 x_req_with = str(env.http_x_requested_with).lower()
                 
                 request.update(
diff --git a/gluon/portalocker.py b/gluon/portalocker.py
index 9d92cb4f..ed1ef8c5 100644
--- a/gluon/portalocker.py
+++ b/gluon/portalocker.py
@@ -140,8 +140,9 @@ class LockedFile(object):
             self.file.close()
             self.file = None
     def __del__(self):
-        self.close()
-
+        if not self.file is None:
+            self.close()
+        
 def read_locked(filename):
     fp = LockedFile(filename, 'r')
     data = fp.read()
diff --git a/gluon/rewrite.py b/gluon/rewrite.py
index 79ac23d0..f23f4afe 100644
--- a/gluon/rewrite.py
+++ b/gluon/rewrite.py
@@ -39,6 +39,7 @@ regex_at = re.compile(r'(?<!\\)\$[a-zA-Z]\w*')
 regex_anything = re.compile(r'(?<!\\)\$anything')
 regex_redirect = re.compile(r'(\d+)->(.*)')
 regex_full_url = re.compile(r'^(?P<scheme>http|https|HTTP|HTTPS)\://(?P<host>[^/]*)(?P<uri>.*)')
+regex_version = re.compile(r'^(_[\d]+\.[\d]+\.[\d]+)$')
 
 def _router_default():
     "return new copy of default base router"
@@ -107,16 +108,16 @@ def log_rewrite(string):
         logger.debug(string)
 
 ROUTER_KEYS = set(
-    ('default_application', 'applications', 
+    ('default_application', 'applications',
      'default_controller', 'controllers',
-     'default_function', 'functions', 
+     'default_function', 'functions',
      'default_language', 'languages',
      'domain', 'domains', 'root_static', 'path_prefix',
      'exclusive_domain', 'map_hyphen', 'map_static',
      'acfe_match', 'file_match', 'args_match'))
 
 ROUTER_BASE_KEYS = set(
-    ('applications', 'default_application', 
+    ('applications', 'default_application',
      'domains', 'path_prefix'))
 
 #  The external interface to rewrite consists of:
@@ -140,8 +141,8 @@ def fixup_missing_path_info(environ):
     path_info = eget('PATH_INFO')
     request_uri = eget('REQUEST_URI')
     if not path_info and request_uri:
-        # for fcgi, get path_info and                           
-        # query_string from request_uri                         
+        # for fcgi, get path_info and
+        # query_string from request_uri
         items = request_uri.split('?')
         path_info = environ['PATH_INFO'] = items[0]
         environ['QUERY_STRING'] = items[1] if len(items) > 1 else ''
@@ -154,15 +155,15 @@ def fixup_missing_path_info(environ):
     if not eget('HTTP_HOST'):
         environ['HTTP_HOST'] = \
             '%s:%s' % (eget('SERVER_NAME'),eget('SERVER_PORT'))
-            
-        
+
+
 def url_in(request, environ):
     "parse and rewrite incoming URL"
     if routers:
         return map_url_in(request, environ)
     return regex_url_in(request, environ)
 
-def url_out(request, env, application, controller, function, 
+def url_out(request, env, application, controller, function,
             args, other, scheme, host, port):
     "assemble and rewrite outgoing URL"
     if routers:
@@ -555,7 +556,7 @@ def regex_filter_in(e):
     query = e.get('QUERY_STRING', None)
     e['WEB2PY_ORIGINAL_URI'] = e['PATH_INFO'] + (query and ('?' + query) or '')
     if thread.routes.routes_in:
-        path = regex_uri(e, thread.routes.routes_in, 
+        path = regex_uri(e, thread.routes.routes_in,
                          "routes_in", e['PATH_INFO'])
         rmatch = regex_redirect.match(path)
         if rmatch:
@@ -587,10 +588,11 @@ regex_space = re.compile('(\+|\s|%20)+')
 #   apps in routes_apps_raw must parse raw_args into args
 
 regex_static = re.compile(r'''
-     (^                              # static pages
-         /(?P<b> \w+)                # b=app
-         /static                     # /b/static
-         /(?P<x> (\w[\-\=\./]?)* )   # x=file
+     (^                                   # static pages
+         /(?P<b> \w+)                     # b=app
+         /static                          # /b/static
+         (/(?P<v>_[\d]+\.[\d]+\.[\d]+))?  # version ?
+         /(?P<x> (\w[\-\=\./]?)* )        # x=file
      $)
      ''', re.X)
 
@@ -639,7 +641,7 @@ def regex_url_in(request, environ):
 
     if thread.routes.routes_in:
         environ = regex_filter_in(environ)
-    
+
     request.env.update((sluggify(k),v) for k,v in environ.iteritems())
 
     path = request.env.path_info.replace('\\', '/')
@@ -650,10 +652,11 @@ def regex_url_in(request, environ):
 
     match = regex_static.match(regex_space.sub('_', path))
     if match and match.group('x'):
+        version = match.group('v')
         static_file = pjoin(request.env.applications_parent,
                                    'applications', match.group('b'),
                                    'static', match.group('x'))
-        return (static_file, environ)
+        return (static_file, version, environ)
 
     # ##################################################
     # parse application, controller and function
@@ -692,7 +695,7 @@ def regex_url_in(request, environ):
             raise HTTP(400,
                        thread.routes.error_message % 'invalid request',
                        web2py_error='invalid path (args)')
-    return (None, environ)
+    return (None, None, environ)
 
 
 def regex_filter_out(url, e=None):
@@ -723,9 +726,9 @@ def regex_filter_out(url, e=None):
     return url
 
 
-def filter_url(url, method='get', remote='0.0.0.0', 
+def filter_url(url, method='get', remote='0.0.0.0',
                out=False, app=False, lang=None,
-               domain=(None,None), env=False, scheme=None, 
+               domain=(None,None), env=False, scheme=None,
                host=None, port=None):
     """
     doctest/unittest interface to regex_filter_in() and regex_filter_out()
@@ -794,7 +797,7 @@ def filter_url(url, method='get', remote='0.0.0.0',
 
     #  rewrite inbound URL
     #
-    (static, e) = url_in(request, e)
+    (static, version, e) = url_in(request, e)
     if static:
         return static
     result = "/%s/%s/%s" % (request.application, request.controller, request.function)
@@ -957,14 +960,15 @@ class MapUrlIn(object):
         a root-static file is one whose incoming URL expects it to be at the root,
         typically robots.txt & favicon.ico
         '''
+
         if len(self.args) == 1 and self.arg0 in self.router.root_static:
             self.controller = self.request.controller = 'static'
             root_static_file = pjoin(self.request.env.applications_parent,
                                    'applications', self.application,
                                    self.controller, self.arg0)
             log_rewrite("route: root static=%s" % root_static_file)
-            return root_static_file
-        return None
+            return root_static_file, None
+        return None, None
 
     def map_language(self):
         "handle language (no hyphen mapping)"
@@ -999,8 +1003,12 @@ class MapUrlIn(object):
         file_match but no hyphen mapping
         '''
         if self.controller != 'static':
-            return None
-        file = '/'.join(self.args)
+            return None, None
+        version = regex_version.match(self.args(0))
+        if self.args and version:
+            file = '/'.join(self.args[1:])
+        else:
+            file = '/'.join(self.args)
         if len(self.args) == 0:
             bad_static = True   # require a file name
         elif '/' in self.file_match:
@@ -1031,7 +1039,7 @@ class MapUrlIn(object):
                                 'static', file)
         self.extension = None
         log_rewrite("route: static=%s" % static_file)
-        return static_file
+        return static_file, version
 
     def map_function(self):
         "handle function.extension"
@@ -1075,7 +1083,7 @@ class MapUrlIn(object):
         ""
         self.request.env.update(
             (sluggify(k),v) for k,v in self.env.iteritems())
-        
+
     def update_request(self):
         '''
         update request from self
@@ -1099,7 +1107,7 @@ class MapUrlIn(object):
         if self.language:
             uri = '/%s%s' % (self.language, uri)
         uri = '/%s%s%s%s' % (
-            app, 
+            app,
             uri,
             urllib.quote('/'+'/'.join(str(x) for x in self.args)) if self.args else '',
             ('?' + self.query) if self.query else '')
@@ -1307,10 +1315,10 @@ def map_url_in(request, env, app=False):
     if app:
         return map.application
 
-    root_static_file = map.map_root_static() # handle root-static files
+    root_static_file, version = map.map_root_static() # handle root-static files
     if root_static_file:
         map.update_request()
-        return (root_static_file, map.env)
+        return (root_static_file, version, map.env)
     # handle mapping of lang/static to static/lang in externally-rewritten URLs
     # in case we have to handle them ourselves
     if map.languages and map.map_static is False and map.arg0 == 'static' and map.args(1) in map.languages:
@@ -1319,14 +1327,14 @@ def map_url_in(request, env, app=False):
     else:
         map.map_language()
         map.map_controller()
-    static_file = map.map_static()
+    static_file, version = map.map_static()
     if static_file:
         map.update_request()
-        return (static_file, map.env)
+        return (static_file, version, map.env)
     map.map_function()
     map.validate_args()
     map.update_request()
-    return (None, map.env)
+    return (None, None, map.env)
 
 def map_url_out(request, env, application, controller,
                 function, args, other, scheme, host, port):
@@ -1364,10 +1372,3 @@ def get_effective_router(appname):
     if not routers or appname not in routers:
         return None
     return Storage(routers[appname])  # return a copy
-
-
-
-
-
-
-
diff --git a/gluon/rocket.py b/gluon/rocket.py
index 43284a21..05d6da6c 100644
--- a/gluon/rocket.py
+++ b/gluon/rocket.py
@@ -1457,33 +1457,29 @@ class Worker(Thread):
     def read_headers(self, sock_file):
         try:
             headers = dict()
-            l = sock_file.readline()
-
-            lname = None
-            lval = None
+            lname = lval = ''            
             while True:
+                line = sock_file.readline()
                 if PY3K:
                     try:
-                        l = str(l, 'ISO-8859-1')
+                        line = str(line, 'ISO-8859-1')
                     except UnicodeDecodeError:
-                        self.err_log.warning('Client sent invalid header: ' + repr(l))
-
-                if l == '\r\n':
+                        self.err_log.warning('Client sent invalid header: ' + repr(line))
+                if line == '\r\n':
+                    if lname: headers[str(lname)] = str(lval)
                     break
-
-                if l[0] in ' \t' and lname:
+                elif line.strip() == '' or '\0' in line:
+                    raise BadRequest("Empty line in hader")
+                elif line[0] in ' \t' and lname:
                     # Some headers take more than one line
-                    lval += ',' + l.strip()
-                else:
-                    # HTTP header values are latin-1 encoded
-                    l = l.split(':', 1)
+                    lval += ' ' + line.strip()
+                elif ':' in line:
+                    if lname: headers[str(lname)] = str(lval)
+                    lname, lval = line.split(':', 1)
                     # HTTP header names are us-ascii encoded
-
-                    lname = l[0].strip().upper().replace('-', '_')
-                    lval = l[-1].strip()
-                headers[str(lname)] = str(lval)
-
-                l = sock_file.readline()
+                    lname = lname.strip().upper().replace('-', '_')
+                    # HTTP header values are latin-1 encoded
+                    lval = lval.strip()
         except socket.timeout:
             raise SocketTimeout("Socket timed out before request.")
 
diff --git a/gluon/sqlhtml.py b/gluon/sqlhtml.py
index 5e345f7c..47b3c823 100644
--- a/gluon/sqlhtml.py
+++ b/gluon/sqlhtml.py
@@ -28,7 +28,7 @@ from dal import DAL, Field, Table, Row, CALLABLETYPES, smart_query, \
 from storage import Storage
 from utils import md5_hash
 from validators import IS_EMPTY_OR, IS_NOT_EMPTY, IS_LIST_OF, IS_DATE, \
-    IS_DATETIME, IS_INT_IN_RANGE, IS_FLOAT_IN_RANGE
+    IS_DATETIME, IS_INT_IN_RANGE, IS_FLOAT_IN_RANGE, IS_STRONG
 
 import datetime
 import urllib
@@ -174,8 +174,7 @@ class TextWidget(FormWidget):
         """
 
         default = dict(value = value)
-        attr = cls._attributes(field, default,
-                               **attributes)
+        attr = cls._attributes(field, default,**attributes)
         return TEXTAREA(**attr)
 
 
@@ -380,12 +379,11 @@ class CheckboxesWidget(OptionsWidget):
         requires = field.requires
         if not isinstance(requires, (list, tuple)):
             requires = [requires]
-        if requires:
-            if hasattr(requires[0], 'options'):
-                options = requires[0].options()
-            else:
-                raise SyntaxError, 'widget cannot determine options of %s' \
-                    % field
+        if requires and hasattr(requires[0], 'options'):
+            options = requires[0].options()
+        else:
+            raise SyntaxError, 'widget cannot determine options of %s' \
+                % field
 
         options = [(k, v) for k, v in options if k != '']
         opts = []
@@ -442,14 +440,23 @@ class PasswordWidget(FormWidget):
 
         see also: :meth:`FormWidget.widget`
         """
-
+        # detect if attached a IS_STRONG with entropy
         default=dict(
             _type='password',
             _value=(value and cls.DEFAULT_PASSWORD_DISPLAY) or '',
             )
         attr = cls._attributes(field, default, **attributes)
+        output = CAT(INPUT(**attr))
 
-        return INPUT(**attr)
+        # deal with entropy check!
+        requires = field.requires
+        if not isinstance(requires,(list,tuple)): requires = [requires]
+        is_strong = [r for r in requires if isinstance(r, IS_STRONG)]
+        if is_strong:
+            output.append(SCRIPT("web2py_validate_entropy(jQuery('#%s'),%s);" \
+                                     % (attr['_id'],is_strong[0].entropy)))
+        # end entropy check
+        return output
 
 
 class UploadWidget(FormWidget):
@@ -682,6 +689,16 @@ def formstyle_divs(form, fields):
         table.append(DIV(_label, _controls, _help, _id=id))
     return table
 
+def formstyle_inline(form, fields):
+    ''' divs only '''
+    if len(fields)!=2:
+        raise RuntimeError, "Not possible"
+    id, label, controls, help = fields[0]
+    submit_button = fields[1][2]
+    return CAT(DIV(controls,_style='display:inline'),
+               submit_button)
+
+
 def formstyle_ul(form, fields):
     ''' unordered list '''
     table = UL()
@@ -807,6 +824,7 @@ class SQLFORM(FORM):
         divs = formstyle_divs,
         ul = formstyle_ul,
         bootstrap = formstyle_bootstrap,
+        inline = formstyle_inline,
         ))
 
     FIELDNAME_REQUEST_DELETE = 'delete_this_record'
@@ -868,6 +886,8 @@ class SQLFORM(FORM):
         self.ignore_rw = ignore_rw
         self.formstyle = formstyle
         self.readonly = readonly
+        # Default dbio setting
+        self.detect_record_change = None
 
         nbsp = XML('&nbsp;') # Firefox2 does not display fields with blanks
         FORM.__init__(self, *[], **attributes)
@@ -1001,11 +1021,11 @@ class SQLFORM(FORM):
                 else:
                     inp = field.formatter(default)
             elif field.type == 'upload':
-                if hasattr(field, 'widget') and field.widget:
+                if field.widget:
                     inp = field.widget(field, default, upload)
                 else:
                     inp = self.widgets.upload.widget(field, default, upload)
-            elif hasattr(field, 'widget') and field.widget:
+            elif field.widget:
                 inp = field.widget(field, default)
             elif field.type == 'boolean':
                 inp = self.widgets.boolean.widget(field, default)
@@ -1121,16 +1141,16 @@ class SQLFORM(FORM):
             if defaults and len(args) - len(defaults) == 4 or len(args) == 4:
                 table = TABLE()
                 for id,a,b,c in xfields:
-                    raw_b = self.field_parent[id] = b
-                    newrows = formstyle(id,a,raw_b,c)
+                    newrows = formstyle(id,a,b,c)
+                    self.field_parent[id] = getattr(b,'parent',None)
                     if type(newrows).__name__ != "tuple":
                         newrows = [newrows]
                     for newrow in newrows:
                         table.append(newrow)
             else:
-                for id,a,b,c in xfields:
-                    self.field_parent[id] = b
                 table = formstyle(self, xfields)
+                for id,a,b,c in xfields:
+                    self.field_parent[id] = getattr(b,'parent',None)
         else:
             raise RuntimeError, 'formstyle not supported'
         return table
@@ -1145,6 +1165,7 @@ class SQLFORM(FORM):
         dbio=True,
         hideerror=False,
         detect_record_change=False,
+        **kwargs
         ):
 
         """
@@ -1169,7 +1190,8 @@ class SQLFORM(FORM):
         # implement logic to detect whether record exist but has been modified
         # server side
         self.record_changed = None
-        if detect_record_change:
+        self.detect_record_change = detect_record_change
+        if self.detect_record_change:
             if self.record:
                 self.record_changed = False
                 serialized = '|'.join(str(self.record[k]) for k in self.table.fields())
@@ -1225,6 +1247,7 @@ class SQLFORM(FORM):
             keepvalues,
             onvalidation,
             hideerror=hideerror,
+            **kwargs
             )
 
         self.deleted = \
@@ -1234,31 +1257,41 @@ class SQLFORM(FORM):
 
         auch = record_id and self.errors and self.deleted
 
-        # auch is true when user tries to delete a record
-        # that does not pass validation, yet it should be deleted
-
-        if not ret and not auch:
+        if self.record_changed and self.detect_record_change:
+            message_onchange = \
+                kwargs.setdefault("message_onchange",
+                    current.T("A record change was detected. " + 
+                              "Consecutive update self-submissions " + 
+                              "are not allowed. Try re-submitting or " +
+                              "refreshing the form page."))
+            if message_onchange is not None:
+                current.response.flash = message_onchange
+            return ret
+        elif (not ret) and (not auch):
+            # auch is true when user tries to delete a record
+            # that does not pass validation, yet it should be deleted
             for fieldname in self.fields:
                 field = self.table[fieldname]
                 ### this is a workaround! widgets should always have default not None!
                 if not field.widget and field.type.startswith('list:') and \
                         not OptionsWidget.has_options(field):
                     field.widget = self.widgets.list.widget
-                if hasattr(field, 'widget') and field.widget and fieldname in request_vars:
+                if field.widget and fieldname in request_vars:
                     if fieldname in self.vars:
                         value = self.vars[fieldname]
                     elif self.record:
                         value = self.record[fieldname]
                     else:
                         value = self.table[fieldname].default
-                    if field.type.startswith('list:') and \
-                            isinstance(value, str):
+                    if field.type.startswith('list:') and isinstance(value, str):
                         value = [value]
                     row_id = '%s_%s%s' % (self.table, fieldname, SQLFORM.ID_ROW_SUFFIX)
                     widget = field.widget(field, value)
-                    self.field_parent[row_id].components = [ widget ]
-                    self.field_parent[row_id]._traverse(False, hideerror)
-                    self.custom.widget[ fieldname ] = widget
+                    parent = self.field_parent[row_id]
+                    if parent:
+                        parent.components = [ widget ]
+                        parent._traverse(False, hideerror)
+                    self.custom.widget[fieldname] = widget
             self.accepted = ret
             return ret
 
@@ -1893,7 +1926,7 @@ class SQLFORM(FORM):
                 search_widget = search_widget[tablename]
             if search_widget=='default':
                 search_menu = SQLFORM.search_menu(sfields)
-                search_widget = lambda sfield, url: CAT(add,FORM(
+                search_widget = lambda sfield, url: CAT(FORM(
                     INPUT(_name='keywords',_value=request.vars.keywords,
                           _id='web2py_keywords',_onfocus="jQuery('#w2p_query_fields').change();jQuery('#w2p_query_panel').slideDown();"),
                     INPUT(_type='submit',_value=T('Search'),_class="btn"),
@@ -1901,6 +1934,7 @@ class SQLFORM(FORM):
                           _onclick="jQuery('#web2py_keywords').val('');"),
                     _method="GET",_action=url),search_menu)
             form = search_widget and search_widget(sfields,url()) or ''
+            console.append(add)
             console.append(form)
             keywords = request.vars.get('keywords','')
             try:
@@ -1945,8 +1979,7 @@ class SQLFORM(FORM):
             if columns and not str(field) in columns: continue
             if not field.readable: continue
             key = str(field)
-            header = headers.get(str(field),
-                                 hasattr(field,'label') and field.label or key)
+            header = headers.get(str(field), field.label or key)
             if sortable:
                 if key == order:
                     key, marker = '~'+order, sorter_icons[0]
@@ -2229,7 +2262,9 @@ class SQLFORM(FORM):
                 else:
                     break
             if nargs>len(args)+1:
-                query = (field == id)
+                query = (field == id)                
+                if isinstance(linked_tables,dict):
+                    linked_tables = linked_tables.get(table._tablename,[])
                 if linked_tables is None or referee in linked_tables:
                     field.represent = lambda id,r=None,referee=referee,rep=field.represent: A(callable(rep) and rep(id) or id,_class=trap_class(),_href=url(args=['view',referee,id]))
         except (KeyError,ValueError,TypeError):
@@ -2254,6 +2289,8 @@ class SQLFORM(FORM):
             if rfield.readable:
                 check[rfield.tablename] = \
                     check.get(rfield.tablename,[])+[rfield.name]
+        if isinstance(linked_tables,dict):
+            linked_tables = linked_tables.get(table._tablename,[])
         for tablename in sorted(check):
             linked_fieldnames = check[tablename]
             tb = db[tablename]
@@ -2702,8 +2739,3 @@ class ExporterXML(ExportClass):
             out.write('</row>\n')
         out.write('</rows>')
         return str(out.getvalue())
-
-
-
-
-
diff --git a/gluon/storage.py b/gluon/storage.py
index 5a985ca4..4a1900d5 100644
--- a/gluon/storage.py
+++ b/gluon/storage.py
@@ -46,7 +46,9 @@ class Storage(dict):
     __repr__ = lambda self: '<Storage %s>' % dict.__repr__(self)
     # http://stackoverflow.com/questions/5247250/why-does-pickle-getstate-accept-as-a-return-value-the-very-instance-it-requi
     __getstate__ = lambda self: None
-
+    __copy__ = lambda self: Storage(self)
+    
+    
     def getlist(self,key):
         """
         Return a Storage value as a list.
diff --git a/gluon/tests/test_dal.py b/gluon/tests/test_dal.py
index fee8842f..b639c5e7 100644
--- a/gluon/tests/test_dal.py
+++ b/gluon/tests/test_dal.py
@@ -448,18 +448,22 @@ class TestMigrations(unittest.TestCase):
         db = DAL('sqlite://.storage.db')
         db.define_table('t', Field('a'), migrate='.storage.table')
         db.commit()
+        db.close()
         db = DAL('sqlite://.storage.db')
         db.define_table('t', Field('a'), Field('b'),
                         migrate='.storage.table')
         db.commit()
+        db.close()
         db = DAL('sqlite://.storage.db')
         db.define_table('t', Field('a'), Field('b', 'text'),
                         migrate='.storage.table')
         db.commit()
+        db.close()
         db = DAL('sqlite://.storage.db')
         db.define_table('t', Field('a'), migrate='.storage.table')
         db.t.drop()
         db.commit()
+        db.close()
 
     def tearDown(self):
         if os.path.exists('.storage.db'):
diff --git a/gluon/tools.py b/gluon/tools.py
index 6130a226..3d4141c1 100644
--- a/gluon/tools.py
+++ b/gluon/tools.py
@@ -1607,7 +1607,7 @@ class Auth(object):
         if settings.cas_provider: ### THIS IS NOT LAZY
             settings.actions_disabled = \
                 ['profile','register','change_password',
-                 'request_reset_password']
+                 'request_reset_password','retrieve_username']
             from gluon.contrib.login_methods.cas_auth import CasAuth
             maps = settings.cas_maps
             if not maps:
@@ -1709,7 +1709,8 @@ class Auth(object):
         """
         login the user = db.auth_user(id)
         """
-        # user=Storage(self.table_user()._filter_fields(user,id=True))
+        user = Storage(self.table_user()._filter_fields(user,id=True))
+        if 'password' in user: del user.password
         current.session.auth = Storage(
             user = user, 
             last_visit = current.request.now,
@@ -3343,6 +3344,7 @@ class Crud(object):
         message=DEFAULT,
         deletable=DEFAULT,
         formname=DEFAULT,
+        **attributes
         ):
         """
         method: Crud.update(table, record, [next=DEFAULT
@@ -3395,7 +3397,8 @@ class Crud(object):
             deletable=deletable,
             upload=self.settings.download_url,
             formstyle=self.settings.formstyle,
-            separator=self.settings.label_separator
+            separator=self.settings.label_separator,
+            **attributes
             )
         self.accepted = False
         self.deleted = False
@@ -3453,6 +3456,7 @@ class Crud(object):
         log=DEFAULT,
         message=DEFAULT,
         formname=DEFAULT,
+        **attributes
         ):
         """
         method: Crud.create(table, [next=DEFAULT [, onvalidation=DEFAULT
@@ -3479,6 +3483,7 @@ class Crud(object):
             message=message,
             deletable=False,
             formname=formname,
+            **attributes
             )
 
     def read(self, table, record):
@@ -4338,34 +4343,39 @@ def prettydate(d,T=lambda x:x):
         return ''
     else:
         return '[invalid date]'
+    if dt.days < 0:
+        suffix = ' from now'
+        dt = -dt
+    else:
+        suffix = ' ago'
     if dt.days >= 2*365:
-        return T('%d years ago') % int(dt.days / 365)
+        return T('%d years'+suffix) % int(dt.days / 365)
     elif dt.days >= 365:
-        return T('1 year ago')
+        return T('1 year'+suffix)
     elif dt.days >= 60:
-        return T('%d months ago') % int(dt.days / 30)
+        return T('%d months'+suffix) % int(dt.days / 30)
     elif dt.days > 21:
-        return T('1 month ago')
+        return T('1 month'+suffix)
     elif dt.days >= 14:
-        return T('%d weeks ago') % int(dt.days / 7)
+        return T('%d weeks'+suffix) % int(dt.days / 7)
     elif dt.days >= 7:
-        return T('1 week ago')
+        return T('1 week'+suffix)
     elif dt.days > 1:
-        return T('%d days ago') % dt.days
+        return T('%d days'+suffix) % dt.days
     elif dt.days == 1:
-        return T('1 day ago')
+        return T('1 day'+suffix)
     elif dt.seconds >= 2*60*60:
-        return T('%d hours ago') % int(dt.seconds / 3600)
+        return T('%d hours'+suffix) % int(dt.seconds / 3600)
     elif dt.seconds >= 60*60:
-        return T('1 hour ago')
+        return T('1 hour'+suffix)
     elif dt.seconds >= 2*60:
-        return T('%d minutes ago') % int(dt.seconds / 60)
+        return T('%d minutes'+suffix) % int(dt.seconds / 60)
     elif dt.seconds >= 60:
-        return T('1 minute ago')
+        return T('1 minute'+suffix)
     elif dt.seconds > 1:
-        return T('%d seconds ago') % dt.seconds
+        return T('%d seconds'+suffix) % dt.seconds
     elif dt.seconds == 1:
-        return T('1 second ago')
+        return T('1 second'+suffix)
     else:
         return T('now')
 
@@ -4755,7 +4765,8 @@ class Wiki(object):
             db.wiki_page.title.default = title_guess
             db.wiki_page.slug.default = slug
             if slug == 'wiki-menu':
-                db.wiki_page.body.default = '- Menu Item > @////index\n- - Submenu > http://web2py.com'
+                db.wiki_page.body.default = \
+                    '- Menu Item > @////index\n- - Submenu > http://web2py.com'
             else:
                 db.wiki_page.body.default = '## %s\n\npage content' % title_guess
         vars = current.request.post_vars
@@ -4913,9 +4924,10 @@ class Wiki(object):
                 query = query|db.wiki_page.title.startswith(request.vars.q)
             if self.restrict_search and not self.manage():
                 query = query&(db.wiki_page.created_by==self.auth.user_id)
-            pages = db(query).select(
+            pages = db(query).select(count,
                 *fields,**dict(orderby=orderby or ~count,
-                               groupby=db.wiki_page.id,
+                               groupby=reduce(lambda a,b:a|b,fields),
+                               distinct=True,
                                limitby=limitby))
             if request.extension in ('html','load'):
                 if not pages:
@@ -4923,18 +4935,19 @@ class Wiki(object):
                                        _class='w2p_wiki_form'))
                 def link(t):
                     return A(t,_href=URL(args='_search',vars=dict(q=t)))
-                items = [DIV(H3(A(p.title,_href=URL(args=p.slug))),
-                             MARKMIN(self.first_paragraph(p)) \
+                items = [DIV(H3(A(p.wiki_page.title,_href=URL(
+                                    args=p.wiki_page.slug))),
+                             MARKMIN(self.first_paragraph(p.wiki_page)) \
                                  if preview else '',
                              DIV(_class='w2p_wiki_tags',
                                  *[link(t.strip()) for t in \
-                                       p.tags or [] if t.strip()]),
+                                       p.wiki_page.tags or [] if t.strip()]),
                              _class='w2p_wiki_search_item')
                          for p in pages]
                 content.append(DIV(_class='w2p_wiki_pages',*items))
             else:
                 cloud=False
-                content = [p.as_dict() for p in pages]
+                content = [p.wiki_page.as_dict() for p in pages]
         elif cloud:
             content.append(self.cloud()['content'])
         if request.extension=='load':
@@ -4945,19 +4958,23 @@ class Wiki(object):
         count = db.wiki_tag.wiki_page.count(distinct=True)
         ids = db(db.wiki_tag).select(
             db.wiki_tag.name,count,
-            groupby=db.wiki_tag.name,
-            orderby=~count,limitby=(0,20))
+            distinct=True,
+            groupby = db.wiki_tag.name,
+            orderby = ~count, limitby=(0,20))
         if ids:
             a,b = ids[0](count), ids[-1](count)
-        def scale(c):
-            return '%.2f' % (3.0*(c-b)/max(a-b,1)+1)
-        items = [A(item.wiki_tag.name,
-                   _style='padding:0.2em;font-size:%sem' \
-                       % scale(item(count)),
-                   _href=URL(args='_search',
-                             vars=dict(q=item.wiki_tag.name)))
-                 for item in ids]
-        return dict(content=DIV(_class='w2p_cloud',*items))
+        def style(c):
+            STYLE ='padding:0 0.2em;line-height:%.2fem;font-size:%.2fem'
+            size = (1.5*(c-b)/max(a-b,1)+1.3)
+            return STYLE % (1.3,size)
+        items = []
+        for item in ids:
+            items.append(A(item.wiki_tag.name,
+                           _style=style(item(count)),
+                           _href=URL(args='_search',
+                                     vars=dict(q=item.wiki_tag.name))))
+            items.append(' ')
+        return dict(content = DIV(_class='w2p_cloud',*items))
 
 if __name__ == '__main__':
     import doctest
diff --git a/gluon/utils.py b/gluon/utils.py
index 06d9c9b1..1d1e232c 100644
--- a/gluon/utils.py
+++ b/gluon/utils.py
@@ -9,6 +9,9 @@ License: LGPLv3 (http://www.gnu.org/licenses/lgpl.html)
 This file specifically includes utilities for security.
 """
 
+import string
+import threading
+import struct
 import hashlib
 import hmac
 import uuid
@@ -18,7 +21,11 @@ import os
 import re
 import logging
 import socket
-from contrib.pbkdf2 import pbkdf2_hex
+try:
+    from contrib.pbkdf2 import pbkdf2_hex
+    HAVE_PBKDF2 = True
+except ImportError:
+    HAVE_PBKDF2 = False
 
 logger = logging.getLogger("web2py")
 
@@ -88,7 +95,7 @@ DIGEST_ALG_BY_SIZE = {
     }
 
 
-### compute constant ctokens
+### compute constant CTOKENS
 def initialize_urandom():
     """
     This function and the web2py_uuid follow from the following discussion:
@@ -108,6 +115,7 @@ def initialize_urandom():
     random.seed(node_id + microseconds)
     try:
         os.urandom(1)
+        have_urandom = True
         try:
             # try to add process-specific entropy
             frandom = open('/dev/urandom','wb')
@@ -119,14 +127,33 @@ def initialize_urandom():
             # works anyway
             pass
     except NotImplementedError:
+        have_urandom = False
         logger.warning(
 """Cryptographically secure session management is not possible on your system because
 your system does not provide a cryptographically secure entropy source.
 This is not specific to web2py; consider deploying on a different operating system.""")
-    return ctokens
-ctokens = initialize_urandom()
+    unpacked_ctokens = struct.unpack('=QQ',string.join(
+            (chr(x) for x in ctokens),''))
+    return unpacked_ctokens, have_urandom
+UNPACKED_CTOKENS, HAVE_URANDOM = initialize_urandom()
 
-def web2py_uuid():
+def fast_urandom16(urandom=[], locker = threading.RLock()):
+    """
+    this is 4x faster than calling os.urandom(16) and prevents
+    the "too many files open" issue with concurrent access to os.urandom()
+    """
+    try:
+        return urandom.pop()
+    except IndexError:
+        try:
+            locker.acquire()
+            ur = os.urandom(16*1024)
+            urandom += [ur[i:i+16] for i in xrange(16,1024*16,16)]
+            return ur[0:16]
+        finally:
+            locker.release()
+
+def web2py_uuid(ctokens=UNPACKED_CTOKENS):
     """
     This function follows from the following discussion:
     http://groups.google.com/group/web2py-developers/browse_thread/thread/7fd5789a7da3f09
@@ -134,15 +161,18 @@ def web2py_uuid():
     It works like uuid.uuid4 except that tries to use os.urandom() if possible
     and it XORs the output with the tokens uniquely associated with this machine.
     """
-    bytes = [random.randrange(256) for i in range(16)]
-    try:
-        ubytes = [ord(c) for c in os.urandom(16)] # use /dev/urandom if possible
-        bytes = [bytes[i] ^ ubytes[i] for i in range(16)]
-    except NotImplementedError:
-        pass
-    ## xor bytes with constant ctokens
-    bytes = ''.join(chr(c ^ ctokens[i]) for i,c in enumerate(bytes))
-    return str(uuid.UUID(bytes=bytes, version=4))
+    rand_longs = struct.unpack('=QQ', string.join(
+            (chr(random.randrange(256)) for i in xrange(16)),''))
+    if HAVE_URANDOM:
+        urand_longs = struct.unpack('=QQ', fast_urandom16())
+        byte_s = struct.pack('=QQ',
+                             rand_longs[0]^urand_longs[0]^ctokens[0], 
+                             rand_longs[1]^urand_longs[1]^ctokens[1])
+    else:
+        byte_s = struct.pack('=QQ', 
+                             rand_longs[0]^ctokens[0], 
+                             rand_longs[1]^ctokens[1])
+    return str(uuid.UUID(bytes=byte_s, version=4))
 
 REGEX_IPv4 = re.compile('(\d+)\.(\d+)\.(\d+)\.(\d+)')
 
diff --git a/gluon/validators.py b/gluon/validators.py
index 457720a1..dbf59fc5 100644
--- a/gluon/validators.py
+++ b/gluon/validators.py
@@ -117,6 +117,10 @@ class Validator(object):
         """
         return value
 
+    def __call__(self,value):
+        raise NotImplementedError
+        return (value, None)
+
 
 class IS_MATCH(Validator):
     """
@@ -508,7 +512,7 @@ class IS_IN_DB(Validator):
                 def count(values, s=self.dbset, f=field):
                     return s(f.belongs(map(int,values))).count()
                 if isinstance(self.dbset.db._adapter, GoogleDatastoreAdapter):
-                    range_ids = range(0,len(ids),30)
+                    range_ids = range(0,len(values),30)
                     total = sum(count(values[i:i+30]) for i in range_ids)
                     if total == len(values):
                         return (values, None)
diff --git a/gluon/widget.py b/gluon/widget.py
index 890080e6..241e9fff 100644
--- a/gluon/widget.py
+++ b/gluon/widget.py
@@ -955,6 +955,19 @@ def check_existent_app(options,appname):
     if os.path.isdir(os.path.join(options.folder, 'applications', appname)):
         return True
 
+def get_code_for_scheduler(app, options):
+    if len(app) == 1 or app[1] == None:
+        code = "from gluon import current;current._scheduler.loop()"
+    else:
+        code = "from gluon import current;current._scheduler.group_names = ['%s'];"
+        code += "current._scheduler.loop()"
+        code = code % ("','".join(app[1:]))
+    app_ = app[0]
+    if not check_existent_app(options, app_):
+        print "Application '%s' doesn't exist, skipping" % (app_)
+        return None, None
+    return app_, code
+
 def start_schedulers(options):
     try:
         from multiprocessing import Process
@@ -965,20 +978,21 @@ def start_schedulers(options):
     apps = [(app.strip(), None) for app in options.scheduler.split(',')]
     if options.scheduler_groups:
         apps = options.scheduler_groups
+    code = "from gluon import current;current._scheduler.loop()"
+    logging.getLogger().setLevel(options.debuglevel)
+    if len(apps) == 1 and not options.with_scheduler:
+        app_, code = get_code_for_scheduler(apps[0], options)
+        if not app_:
+            return
+        print 'starting single-scheduler for "%s"...' % app_
+        run(app_,True,True,None,False,code)
+        return
     for app in apps:
-        if len(app) == 1 or app[1] == None:
-            code = "from gluon import current;current._scheduler.loop()"
-        else:
-            code = "from gluon import current;current._scheduler.group_names = ['%s'];"
-            code += "current._scheduler.loop()"
-            code = code % ("','".join(app[1:]))
-        app_ = app[0]
-        if not check_existent_app(options, app_):
-            print "Application '%s' doesn't exist, skipping" % (app_)
+        app_, code = get_code_for_scheduler(app, options)
+        if not app_:
             continue
         print 'starting scheduler for "%s"...' % app_
         args = (app_,True,True,None,False,code)
-        logging.getLogger().setLevel(options.debuglevel)
         p = Process(target=run, args=args)
         processes.append(p)
         print "Currently running %s scheduler processes" % (len(processes))
diff --git a/scripts/make_min_web2py.py b/scripts/make_min_web2py.py
index b98bd4b0..4c3fec52 100644
--- a/scripts/make_min_web2py.py
+++ b/scripts/make_min_web2py.py
@@ -23,7 +23,7 @@ applications/welcome/controllers/default.py
 
 # files and folders to exclude from gluon folder (comment with # if needed)
 IGNORED = """
-gluon/contrib/comet_messaging.py
+gluon/contrib/websocket_messaging.py
 gluon/contrib/feedparser.py
 gluon/contrib/generics.py
 gluon/contrib/gql.py
diff --git a/scripts/setup-web2py-nginx-uwsgi-ubuntu.sh b/scripts/setup-web2py-nginx-uwsgi-ubuntu.sh
index f62a529b..264f9bc7 100644
--- a/scripts/setup-web2py-nginx-uwsgi-ubuntu.sh
+++ b/scripts/setup-web2py-nginx-uwsgi-ubuntu.sh
@@ -22,7 +22,8 @@ echo 'server {
            root /home/www-data/web2py/applications/;
         }
          location / {
-                uwsgi_pass      127.0.0.1:9001;
+                #uwsgi_pass      127.0.0.1:9001;
+                uwsgi_pass      unix:///run/uwsgi/app/web2py/web2py.socket;
                 include         uwsgi_params;
                 uwsgi_param     UWSGI_SCHEME $scheme;
                 uwsgi_param     SERVER_SOFTWARE    nginx/$nginx_version;
@@ -36,7 +37,8 @@ server {
         ssl_certificate         /etc/nginx/ssl/web2py.crt;
         ssl_certificate_key     /etc/nginx/ssl/web2py.key;
         location / {
-                uwsgi_pass      127.0.0.1:9001;
+                #uwsgi_pass      127.0.0.1:9001;
+                uwsgi_pass      unix:///run/uwsgi/app/web2py/web2py.socket;
                 include         uwsgi_params;
                 uwsgi_param     UWSGI_SCHEME $scheme;
                 uwsgi_param     SERVER_SOFTWARE    nginx/$nginx_version;
@@ -55,11 +57,23 @@ openssl x509 -req -days 1780 -in web2py.csr -signkey web2py.key -out web2py.crt
 # Create configuration file /etc/uwsgi/apps-available/web2py.xml
 echo '<uwsgi>
     <plugin>python</plugin>
-    <socket>127.0.0.1:9001</socket>
+    <socket>/run/uwsgi/app/web2py/web2py.socket</socket>
     <pythonpath>/home/www-data/web2py/</pythonpath>
     <app mountpoint="/">
         <script>wsgihandler</script>
     </app>
+    <master/>
+    <processes>4</processes>
+    <harakiri>60</harakiri> 
+    <reload-mercy>8</reload-mercy>
+    <cpu-affinity>1</cpu-affinity>
+    <stats>/tmp/stats.socket</stats>
+    <max-requests>2000</max-requests>
+    <limit-as>512</limit-as>
+    <reload-on-as>256</reload-on-as>
+    <reload-on-rss>192</reload-on-rss>
+    <no-orphans/>
+    <vacuum/>    
 </uwsgi>' >/etc/uwsgi/apps-available/web2py.xml
 ln -s /etc/uwsgi/apps-available/web2py.xml /etc/uwsgi/apps-enabled/web2py.xml
 
diff --git a/setup.py b/setup.py
index 3dbc628e..f87f315c 100644
--- a/setup.py
+++ b/setup.py
@@ -77,8 +77,3 @@ if __name__ == '__main__':
     #s = raw_input('>')
     #if s.lower()[:1]=='y':
     start()
-
-
-
-
-