Index: branches/eam_branches/20090522/Nebulous/bin/neb-locate
===================================================================
--- branches/eam_branches/20090522/Nebulous/bin/neb-locate	(revision 24238)
+++ branches/eam_branches/20090522/Nebulous/bin/neb-locate	(revision 24557)
@@ -41,4 +41,6 @@
     unless defined $neb;
 
+$volume = 'any' if defined $all;
+
 my $uris;
 if (defined $volume) {
@@ -70,5 +72,5 @@
 }
 
-print join(" ", @files), "\n";
+print join("\n", @files), "\n";
 
 __END__
Index: branches/eam_branches/20090522/Nebulous/bin/neb-ls
===================================================================
--- branches/eam_branches/20090522/Nebulous/bin/neb-ls	(revision 24238)
+++ branches/eam_branches/20090522/Nebulous/bin/neb-ls	(revision 24557)
@@ -21,4 +21,7 @@
 
 $server = $ENV{'NEB_SERVER'} unless $server;
+
+# make --long the default
+$long = 1;
 
 GetOptions(
Index: branches/eam_branches/20090522/Nebulous/bin/neb-replicate
===================================================================
--- branches/eam_branches/20090522/Nebulous/bin/neb-replicate	(revision 24238)
+++ branches/eam_branches/20090522/Nebulous/bin/neb-replicate	(revision 24557)
@@ -16,5 +16,5 @@
 use Pod::Usage qw( pod2usage );
 
-my ($server, $volume, $copies);
+my ($server, $volume, $copies, $set_copies);
 $copies = 1;  # default to making just one copy
 
Index: branches/eam_branches/20090522/Nebulous/bin/neb-rm
===================================================================
--- branches/eam_branches/20090522/Nebulous/bin/neb-rm	(revision 24238)
+++ branches/eam_branches/20090522/Nebulous/bin/neb-rm	(revision 24557)
@@ -16,9 +16,15 @@
 use Pod::Usage qw( pod2usage );
 
-my ($server);
+my (
+    $force,
+    $move,
+    $server,
+);
 
 $server = $ENV{'NEB_SERVER'} unless $server;
 
 GetOptions(
+    'force|f'       => \$force,
+    'move|m'        => \$move,
     'server|s=s'    => \$server,
 ) || pod2usage( 2 );
@@ -35,5 +41,9 @@
 
 foreach my $key (@ARGV) {
-    $neb->delete($key) or warn "failed to delete key: $key";
+    unless (defined $move) {
+        $neb->delete($key) or warn "failed to delete key: $key";
+    } else {
+        $neb->move($key, "${key}.rm") or warn "failed to move key: $key";
+    }
 }
 
@@ -48,5 +58,5 @@
 =head1 SYNOPSIS
 
-    neb-rm [--server <URL>] <key...>
+    neb-rm [--server <URL>] [--force] [--move] <key...>
 
 =head1 DESCRIPTION
@@ -58,4 +68,18 @@
 
 =over 4
+
+=item * --force|-f
+
+When set, C<<key>> will be removed from the nebulous database even if the on
+disk file(s) are missing.
+
+Optional.
+
+=item * --move|-m
+
+When set, this flag causes C<<key>> to be renamed to C<<key>.rm> instead of
+being deleted.
+
+Optional.
 
 =item * --server|-s <URL>
Index: branches/eam_branches/20090522/Nebulous/bin/neb-stat
===================================================================
--- branches/eam_branches/20090522/Nebulous/bin/neb-stat	(revision 24238)
+++ branches/eam_branches/20090522/Nebulous/bin/neb-stat	(revision 24557)
@@ -41,5 +41,5 @@
 my $stat = $neb->stat($key);
 die "nebulous key: $key not found" unless $stat;   
-my $instances = $neb->find_instances($key, ':any');
+my $instances = $neb->find_instances($key, 'any');
 die "no instances found" unless $instances;