diff --git a/CHANGES b/CHANGES
index 62ff3d379..76358d96e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,13 @@
+1.3079_04   02.10.2011
+
+    [ ENHANCEMENTS ]
+    * PSGI handler code cleaned up (chromatic).
+    * Improved warning localizations (chromatic).
+
+    [ DOCUMENTATION ]
+    * Dancer::Plugins typos (Olof Johansson).
+    * PSGI handler documented (chromatic).
+
 1.3079_03   10.09.2011
 
     [ ENHANCEMENTS ]
diff --git a/lib/Dancer.pm b/lib/Dancer.pm
index 3a9518477..3efb3b9e8 100644
--- a/lib/Dancer.pm
+++ b/lib/Dancer.pm
@@ -5,7 +5,7 @@ use warnings;
 use Carp;
 use Cwd 'realpath';
 
-our $VERSION   = '1.3079_03';
+our $VERSION   = '1.3079_04';
 our $AUTHORITY = 'SUKRIA';
 
 use Dancer::App;
@@ -1582,6 +1582,12 @@ For example, to disable the layout for a specific request:
         template 'index.tt', {}, { layout => undef };
     };
 
+Or to request a specific layout, of course:
+
+    get '/user' => sub {
+        template 'user.tt', {}, { layout => 'user' };
+    };
+
 Some tokens are automatically added to your template (C<perl_version>,
 C<dancer_version>, C<settings>, C<request>, C<params>, C<vars> and, if
 you have sessions enabled, C<session>).  Check
diff --git a/lib/Dancer/Config.pm b/lib/Dancer/Config.pm
index 92cb2259f..b6eecb26a 100644
--- a/lib/Dancer/Config.pm
+++ b/lib/Dancer/Config.pm
@@ -417,6 +417,9 @@ use Template Toolkit, add the following to C<config.yml>:
 The name of the layout to use when rendering view. Dancer will look for
 a matching template in the directory $views/layout.
 
+Your can override the default layout using the third argument of the
+C<template> keyword. Check C<Dancer> manpage for details.
+
 
 =head2 Logging, debugging and error handling
 
diff --git a/lib/Dancer/Handler/PSGI.pm b/lib/Dancer/Handler/PSGI.pm
index 7844d28d6..98b657a28 100644
--- a/lib/Dancer/Handler/PSGI.pm
+++ b/lib/Dancer/Handler/PSGI.pm
@@ -20,7 +20,6 @@ sub new {
 
     my $self = {};
     bless $self, $class;
-    return $self;
 }
 
 sub start {
@@ -51,7 +50,7 @@ sub apply_plack_middlewares_map {
 
     while ( my ( $path, $mw ) = each %$mw_map ) {
         my $builder = Plack::Builder->new();
-        map { $builder->add_middleware(@$_) } @$mw;
+        $builder->add_middleware(@$_) for @$mw;
         $urlmap->map( $path => $builder->to_app($app) );
     }
 
@@ -67,19 +66,17 @@ sub apply_plack_middlewares {
     croak "Plack::Builder is needed for middlewares support"
       unless Dancer::ModuleLoader->load('Plack::Builder');
 
-    my $builder = Plack::Builder->new();
-
     ref $middlewares eq "ARRAY"
       or croak "'plack_middlewares' setting must be an ArrayRef";
 
-    map {
-        Dancer::Logger::core "add middleware " . $_->[0];
-        $builder->add_middleware(@$_)
-    } @$middlewares;
+    my $builder = Plack::Builder->new();
 
-    $app = $builder->to_app($app);
+    for my $mw (@$middlewares) {
+        Dancer::Logger::core "add middleware " . $mw->[0];
+        $builder->add_middleware(@$mw)
+    }
 
-    return $app;
+    return $builder->to_app($app);
 }
 
 sub init_request_headers {
@@ -89,3 +86,32 @@ sub init_request_headers {
 }
 
 1;
+__END__
+
+=pod
+
+=head1 NAME
+
+Dancer::Handler::PSGI - a PSGI handler for Dancer applications
+
+=head1 DESCRIPTION
+
+This handler allows Dancer applications to run as part of PSGI stacks. Dancer
+will automatically determine when running in a PSGI environment and enable this
+handler, such that calling C<dance> will return a valid PSGI application.
+
+You may enable Plack middleware in your configuration file under the
+C<plack_middlewares> key. See L<Dancer::Cookbook> for more information.
+
+Note that you must have L<Plack> installed for this handler to work.
+
+=head1 USAGE
+    # in bin/app.pl
+    set apphandler => 'Debug';
+
+    # then, run the app the following way
+    perl -d bin/app.pl GET '/some/path/to/test' 'with=parameters&other=42'
+
+=head1 AUTHORS
+
+Dancer contributors
diff --git a/lib/Dancer/Plugins.pod b/lib/Dancer/Plugins.pod
index 1d214f1bf..ac83b3c88 100644
--- a/lib/Dancer/Plugins.pod
+++ b/lib/Dancer/Plugins.pod
@@ -87,7 +87,7 @@ Provides dead-simple profiling of your app using L<Devel::NYTProf> - enables
 profiling for each request individually, serves up a list of profiling runs, and
 generates & sends the HTML reports produced by C<nytprofhtml>.
 
-=item L<Dancer::Plugin::Bcypt>
+=item L<Dancer::Plugin::Bcrypt>
 
 Provides simple effective password hashing and validation using Bcrypt.
 
diff --git a/lib/Dancer/Route.pm b/lib/Dancer/Route.pm
index 6dfb2f774..6428e7304 100644
--- a/lib/Dancer/Route.pm
+++ b/lib/Dancer/Route.pm
@@ -236,8 +236,10 @@ sub execute {
 
     if (Dancer::Config::setting('warnings')) {
         my $warning;
-        local $SIG{__WARN__} = sub { $warning = $_[0] };
-        my $content = $self->code->();
+        my $content = do {
+            local $SIG{__WARN__} = sub { $warning = $_[0] };
+            $self->code->();
+        };
         if ($warning) {
             return Dancer::Error->new(
                 code    => 500,
diff --git a/t/00_base/14_changelog.t b/t/00_base/14_changelog.t
index 65a4c5687..bb391f0d2 100644
--- a/t/00_base/14_changelog.t
+++ b/t/00_base/14_changelog.t
@@ -13,7 +13,7 @@ unless ( $ENV{RELEASE_TESTING} ) {
 my $changelog_filename = 'CHANGES';
 
 # don't check for versions older or equal to this
-my $stop_checking_version = '1.3071';
+my $stop_checking_version = '1.3079_03';
 
 # ordered list of possible sections
 my @possible_sections = ('SECURITY', 'API CHANGES', 'BUG FIXES', 'ENHANCEMENTS', 'DOCUMENTATION', );
diff --git a/t/11_logger/05_format.t b/t/11_logger/05_format.t
index 882180a84..a5c32aa95 100644
--- a/t/11_logger/05_format.t
+++ b/t/11_logger/05_format.t
@@ -63,7 +63,9 @@ $str = $l->format_message('debug', 'this is debug');
 like $str, qr/\[text\/html\] this is debug/;
 
 my $warn;
-local $SIG{__WARN__} = sub { $warn = $_[0] };
-setting logger_format => '%y';
-$str = $l->format_message('debug', 'this is sparta');
+do {
+    local $SIG{__WARN__} = sub { $warn = $_[0] };
+    setting logger_format => '%y';
+    $str = $l->format_message('debug', 'this is sparta');
+};
 like $warn, qr/%y not supported/;