diff --git a/lib/WebGUI.pm b/lib/WebGUI.pm
index 6fcd192dd..5594bed5a 100644
--- a/lib/WebGUI.pm
+++ b/lib/WebGUI.pm
@@ -66,6 +66,8 @@ sub call {
     my $self = shift;
     my $env = shift;
 
+local $SIG{USR1} = sub { Carp::confess; };
+
     ##Enable size limiting
     $env->{'psgix.harakiri'} = 1;
 
diff --git a/lib/WebGUI/Image.pm b/lib/WebGUI/Image.pm
index 773d6d246..c7d49dab2 100644
--- a/lib/WebGUI/Image.pm
+++ b/lib/WebGUI/Image.pm
@@ -2,7 +2,7 @@ package WebGUI::Image;
 
 use strict;
 use WebGUI::Image::Palette;
-use Image::Magick;
+# use Image::Magick;
 
 =head1 NAME
 
diff --git a/share/site.psgi b/share/site.psgi
index f1c507a1f..8ddc42a26 100644
--- a/share/site.psgi
+++ b/share/site.psgi
@@ -48,18 +48,18 @@ builder {
     # enable_if { $_[0]->{'webgui.debug'} } 'StackTrace';
     enable_if { $_[0]->{'webgui.debug'} } '+WebGUI::Middleware::StackTrace';
 
-    enable_if { $_[0]->{'webgui.debug'} } 'Debug', panels => [
-        'Timer',
-        'Memory',
-        'Session',
-        'Parameters',
-        'PerlConfig',
-        [ 'MySQLTrace', skip_packages => qr/\AWebGUI::SQL(?:\z|::)/ ],
-        'Response',
-        'Logger',
-    ];
-    enable_if { $_[0]->{'webgui.debug'} } '+WebGUI::Middleware::Debug::Environment';
-    enable_if { $_[0]->{'webgui.debug'} } '+WebGUI::Middleware::Debug::Performance';
+#    enable_if { $_[0]->{'webgui.debug'} } 'Debug', panels => [
+#        'Timer',
+#        'Memory',
+#        'Session',
+#        'Parameters',
+#        'PerlConfig',
+#        [ 'MySQLTrace', skip_packages => qr/\AWebGUI::SQL(?:\z|::)/ ],
+#        'Response',
+#        'Logger',
+#    ];
+#    enable_if { $_[0]->{'webgui.debug'} } '+WebGUI::Middleware::Debug::Environment';
+#    enable_if { $_[0]->{'webgui.debug'} } '+WebGUI::Middleware::Debug::Performance';
 
     # This one uses the Session object, so it comes after WebGUI::Middleware::Session
     mount $config->get('uploadsURL') => builder {
diff --git a/www/extras/admin/admin.js b/www/extras/admin/admin.js
index f09c17bc9..aa3b04f1c 100644
--- a/www/extras/admin/admin.js
+++ b/www/extras/admin/admin.js
@@ -1877,6 +1877,8 @@ WebGUI.Admin.Tree.prototype.runHelperForSelected
     var self = this;
     var assetIds = this.getSelected();
 
+    alert("ok");
+
     // Open the dialog with two progress bars
     var dialog  = new YAHOO.widget.Panel( 'helperForkModalDialog', {
         "width"             : '350px',
diff --git a/www/extras/admin/toolbar.js b/www/extras/admin/toolbar.js
index 72421a7e6..fc3ee9ffe 100644
--- a/www/extras/admin/toolbar.js
+++ b/www/extras/admin/toolbar.js
@@ -32,6 +32,15 @@ WebGUI.Toolbar.createAll = function( ) {
     var holders = YAHOO.util.Selector.query( '.wg-admin-toolbar' );
     for ( var i = 0; i < holders.length; i++ ) {
         var holder = holders[i];
+
+        // when flipping between Tree and View tabs with edit on, clear out the containers for the toolbars before re-adding the toolbars
+        var holder_yui = new YAHOO.util.Element( holder );
+        var child;
+        while( child = YAHOO.util.Dom.getFirstChild( holder ) ) {
+            holder_yui.removeChild( child );
+            // console.log("removing: " + child + " from " + holder_yui);
+        }
+
         var assetId = holder.id.match( /wg-admin-toolbar-(.+)/ )[1];
         var toolbar = new WebGUI.Toolbar( assetId, { "parent" : holder } );
         toolbar.getAssetData( assetId, bind( toolbar, toolbar.render ) );