diff -r BackupPC-3.2.1.dist/bin/BackupPC_dump BackupPC-3.2.1/bin/BackupPC_dump
203a204,206
> mkpath("$Dir/pool", 0, 0777) if ( !-d "$Dir/pool" );
> mkpath("$Dir/cpool", 0, 0777) if ( !-d "$Dir/cpool" );
> mkpath("$Dir/trash", 0, 0777) if ( !-d "$Dir/trash" );
541a545,560
> foreach my $dir ( (
>             "$Conf{TopDir}/pc/$host/pool",
>             "$Conf{TopDir}/pc/$host/cpool",
>             "$Conf{TopDir}/pc/$host/trash",
>         ) ) {
>     next if ( -d $dir );
>     mkpath($dir, 0, 0750);
>     if ( !-d $dir ) {
>         print("Failed to create $dir\n");
>         printf(LOG "%sFailed to create directory %s\n", $bpc->timeStamp, $dir);
>         exit(1);
>     } else {
>         printf(LOG "%sCreated directory %s\n", $bpc->timeStamp, $dir);
>     }
> }
> 
545c564
< $bpc->RmTreeDefer("$TopDir/trash", "$Dir/new") if ( -d "$Dir/new" );
---
> $bpc->RmTreeDefer("$Dir/trash", "$Dir/new") if ( -d "$Dir/new" );
1208c1227
<         $bpc->RmTreeDefer("$TopDir/trash", "$Dir/new") if ( -d "$Dir/new" );
---
>         $bpc->RmTreeDefer("$Dir/trash", "$Dir/new") if ( -d "$Dir/new" );
1454c1473
<     $bpc->RmTreeDefer("$TopDir/trash", "$Dir/$num") if ( -d "$Dir/$num" );
---
>     $bpc->RmTreeDefer("$Dir/trash", "$Dir/$num") if ( -d "$Dir/$num" );
1583c1602
<     $bpc->RmTreeDefer("$TopDir/trash",
---
>     $bpc->RmTreeDefer("$Dir/trash",
diff -r BackupPC-3.2.1.dist/bin/BackupPC_nightly BackupPC-3.2.1/bin/BackupPC_nightly
140c140,151
< for my $pool ( qw(pool cpool) ) {
---
> my @pools = (qw (pool cpool));
> 
> opendir(my $dh, "$TopDir/pc");
> while (readdir $dh) {
>   my $hostdir=$_;
>   next if ($hostdir eq "." || $hostdir eq ".." );
>   push @pools,"pc/$hostdir/pool" if ( -d "$TopDir/pc/$hostdir/pool" );
>   push @pools,"pc/$hostdir/cpool" if ( -d "$TopDir/pc/$hostdir/cpool" );
> }
> 
> for my $pool ( @pools ) {
>     print "Operating on pool: $TopDir/$pool\n" if ( -d "$TopDir/$pool");
diff -r BackupPC-3.2.1.dist/bin/BackupPC_trashClean BackupPC-3.2.1/bin/BackupPC_trashClean
57a58,73
>     opendir(my $dh, "$TopDir/pc");
>     while (readdir $dh) {
>       #check for pc/<hostname>/trash dirs
>       my $hostdir=$_;
>       next if ($hostdir eq "." || $hostdir eq ".." );
>       if ( -d "$TopDir/pc/$hostdir/trash" ) {
>         #try to clean it
>         if ( $bpc->RmTreeTrashEmpty("$TopDir/pc/$hostdir/trash") < 0 ) {
> 	  print("log BackupPC_trashClean failed to empty $TopDir/trash\n");
>         }
>       } else {
>         #mention none found
>         print("log BackupPC_trashClean failed to find $TopDir/pc/$hostdir/trash\n");
>       }
>     }
>     closedir $dh;
diff -r BackupPC-3.2.1.dist/lib/BackupPC/CGI/EditConfig.pm BackupPC-3.2.1/lib/BackupPC/CGI/EditConfig.pm
338a339,340
> 	    {name => "PoolDir"},
> 	    {name => "CPoolDir"},
diff -r BackupPC-3.2.1.dist/lib/BackupPC/Config/Meta.pm BackupPC-3.2.1/lib/BackupPC/Config/Meta.pm
325a326,327
>     PoolDir         	=> {type => "string", undefIfEmpty => 1},
>     CPoolDir        	=> {type => "string", undefIfEmpty => 1},
470a473,474
>                 PoolDir                   => "boolean",
>                 CPoolDir                  => "boolean",
diff -r BackupPC-3.2.1.dist/lib/BackupPC/Lib.pm BackupPC-3.2.1/lib/BackupPC/Lib.pm
157a158,163
>     foreach my $dir ( qw(PoolDir CPoolDir) ) {
>         next if ( $bpc->{Conf}{$dir} eq "" );
>         $bpc->{$dir} = $bpc->{Conf}{$dir};
>     }
> 
> 
371a378,382
>     foreach my $dir ( qw(PoolDir CPoolDir) ) {
>         next if ( $bpc->{Conf}{$dir} eq "" );
>         $bpc->{$dir} = $bpc->{Conf}{$dir};
>     }
> 
1412c1423
<     foreach my $param qw(BackupFilesOnly BackupFilesExclude) {
---
>     foreach my $param (qw(BackupFilesOnly BackupFilesExclude)) {
diff -r BackupPC-3.2.1.dist/lib/BackupPC/Storage/Text.pm BackupPC-3.2.1/lib/BackupPC/Storage/Text.pm
301c301
<     foreach my $param qw(BackupFilesOnly BackupFilesExclude) {
---
>     foreach my $param (qw(BackupFilesOnly BackupFilesExclude)) {