diff --git a/Tools/SOGoToolBackup.m b/Tools/SOGoToolBackup.m
index 5513dd2a4..2746b5a32 100644
--- a/Tools/SOGoToolBackup.m
+++ b/Tools/SOGoToolBackup.m
@@ -40,6 +40,11 @@
 #import "NSDictionary+SOGoTool.h"
 #import "SOGoToolBackup.h"
 
+/* TODO:
+   - respond to "--help backup"
+   - allow more than one user specifier on the command-line
+*/
+
 @implementation SOGoToolBackup
 
 + (NSString *) command
@@ -149,7 +154,7 @@
   BOOL rc;
   NSString *identifier;
 
-  if ([arguments count] == 2)
+  if ([arguments count] > 1)
     {
       ASSIGN (directory, [arguments objectAtIndex: 0]);
       identifier = [arguments objectAtIndex: 1];
diff --git a/Tools/sogo-tool.m b/Tools/sogo-tool.m
index 871c84392..001ea8186 100644
--- a/Tools/sogo-tool.m
+++ b/Tools/sogo-tool.m
@@ -31,6 +31,10 @@
 
 #import "SOGoTool.h"
 
+/* TODO:
+   - help for modules
+   - have a help syntax/mechanism similar to the one in monotone */
+
 @interface SOGoToolDispatcher : NSObject
 {
   NSMutableDictionary *tools;