diff --git a/doc/promo b/doc/promo
index 99d6a6c2..b0a1bc3d 100644
--- a/doc/promo
+++ b/doc/promo
@@ -24,6 +24,7 @@ http://nd.gd/0u http://www.gnu.org/software/parallel/
 http://nd.gd/0s http://www.youtube.com/watch?v=OpaiGYxkSuQ
 http://nd.gd/0t http://en.wikipedia.org/wiki/Xargs#The_separator_problem
 http://nd.gd/3k http://www.gnu.org/software/parallel/man.html#differences_between_xargs_and_gnu_parallel
+http://nd.gd/po http://www.gnu.org/software/parallel/man.html#example__distributing_work_to_local_and_remote_computers
 
 If you like xargs you may love GNU Parallel: http://nd.gd/0s
 
diff --git a/src/niceload b/src/niceload
index b601c4f6..568013dd 100755
--- a/src/niceload
+++ b/src/niceload
@@ -585,13 +585,17 @@ sub signal_pids {
 
 sub multiply_binary_prefix {
     # Evalualte numbers with binary prefix
-    # 13G = 13*1073741824 = 13958643712
+    # 13G = 13*1024*1024*1024 = 13958643712
     my $s = shift;
     $s =~ s/Ki?/*1024/gi;
-    $s =~ s/Mi?/*1048576/gi;
-    $s =~ s/Gi?/*1073741824/gi;
-    $s =~ s/Ti?/*1099511627776/gi;
-    $s =~ s/Pi?/*1125899906842624/gi;
+    $s =~ s/Mi?/*1024*1024/gi;
+    $s =~ s/Gi?/*1024*1024*1024/gi;
+    $s =~ s/Ti?/*1024*1024*1024*1024/gi;
+    $s =~ s/Pi?/*1024*1024*1024*1024*1024/gi;
+    $s =~ s/Ei?/*1024*1024*1024*1024*1024*1024/gi;
+    $s =~ s/Zi?/*1024*1024*1024*1024*1024*1024*1024/gi;
+    $s =~ s/Yi?/*1024*1024*1024*1024*1024*1024*1024*1024/gi;
+    $s =~ s/Xi?/*1024*1024*1024*1024*1024*1024*1024*1024*1024/gi;
     $s = eval $s;
     return $s;
 }
diff --git a/src/parallel b/src/parallel
index cb59b08d..ccf7b9ce 100755
--- a/src/parallel
+++ b/src/parallel
@@ -65,11 +65,13 @@ if($::opt_nonall or $::opt_onall) {
     # Pass some of the options to the sub-parallels, not all of them as
     # -P should only go to the first, and -S should not be copied at all.
     my $options =
-	((defined $::opt_u) ? "-u" : " ") .
-	((defined $::opt_g) ? "-g" : " ") .
-	"";
-    ::debug("| parallel $options");
-    open(PARALLEL,"| parallel $options -P $::opt_P") || die;
+	join(" ",
+	     ((defined $::opt_u) ? "-u" : ""),
+	     ((defined $::opt_g) ? "-g" : ""),
+	     ((defined @::opt_v) ? "-vv" : ""),
+	);
+    ::debug("| parallel");
+    open(PARALLEL,"| parallel -P $::opt_P") || die;
     for my $sshlogin (values %Global::host) {
 	print PARALLEL "parallel $options -j1 -S ".
 	    shell_quote_scalar($sshlogin->string())." ".
@@ -934,13 +936,17 @@ sub usleep {
 
 sub multiply_binary_prefix {
     # Evalualte numbers with binary prefix
-    # 13G = 13*1073741824 = 13958643712
+    # 13G = 13*1024*1024*1024 = 13958643712
     my $s = shift;
     $s =~ s/Ki?/*1024/gi;
-    $s =~ s/Mi?/*1048576/gi;
-    $s =~ s/Gi?/*1073741824/gi;
-    $s =~ s/Ti?/*1099511627776/gi;
-    $s =~ s/Pi?/*1125899906842624/gi;
+    $s =~ s/Mi?/*1024*1024/gi;
+    $s =~ s/Gi?/*1024*1024*1024/gi;
+    $s =~ s/Ti?/*1024*1024*1024*1024/gi;
+    $s =~ s/Pi?/*1024*1024*1024*1024*1024/gi;
+    $s =~ s/Ei?/*1024*1024*1024*1024*1024*1024/gi;
+    $s =~ s/Zi?/*1024*1024*1024*1024*1024*1024*1024/gi;
+    $s =~ s/Yi?/*1024*1024*1024*1024*1024*1024*1024*1024/gi;
+    $s =~ s/Xi?/*1024*1024*1024*1024*1024*1024*1024*1024*1024/gi;
     $s = eval $s;
     return $s;
 }
diff --git a/src/parallel.pod b/src/parallel.pod
index 0423e752..15f5496a 100644
--- a/src/parallel.pod
+++ b/src/parallel.pod
@@ -705,6 +705,8 @@ reading everything at startup.
 By sending GNU B<parallel> SIGUSR2 you can toggle turning on/off
 B<--progress> on a running GNU B<parallel> process.
 
+See also: B<--eta>
+
 
 =item B<--max-args>=I<max-args>