diff --git a/base.py b/base.py
index d732b08..1c591c0 100644
--- a/base.py
+++ b/base.py
@@ -414,7 +414,8 @@ class ServiceManager:
             ins = None
         instances = self.wildcard(ins)
         if instances is None:
-            ins_set = {ins}
+            # ins_set = {ins}
+            ins_set = set(self.info)
         else:
             ins_set = set(instances)
         cfginfo = {}
@@ -496,9 +497,9 @@ class ServiceManager:
                 options['remark'] = ' '
                 wildcards = False
             else:
-                options['legend'] = '        [instance] is empty or one of %s\n' % ', '.join(self.info)
+                options['legend'] = '      [instance] is empty or one of %s\n' % ', '.join(self.info)
         else:
-            options['legend'] = '        <instance> is one of %s' % ', '.join(self.info)
+            options['legend'] = '      <instance> is one of %s\n' % ', '.join(self.info)
         if wildcards:
             options['legend'] += "      * wildcards allowed, using '.' to replace 0 or more arbitrary characters in <instance>\n"
         print(self.USAGE % options)
diff --git a/nicosman.py b/nicosman.py
index f5672d2..ec3c6a7 100644
--- a/nicosman.py
+++ b/nicosman.py
@@ -55,17 +55,16 @@ class NicosManager(ServiceManager):
     Usage:
 
       nicos gui <instance>
-      nicos <instance>                  (the same as above)
+      nicos <instance>                   (the same as above)
       nicos list [<instance>]
-      nicos start <instance> [<service>]           *
-      nicos restart <instance> [<service>]         *
-      nicos stop <instance> [<service>]            *
-      nicos create <instance> <nr>                 *
+      nicos start <instance> [<service>]
+      nicos restart <instance> [<service>]        %(remark)s
+      nicos stop <instance> [<service>]           %(remark)s
+      nicos create <instance> <nr>
       nicos link <instance>              (create links to nicos data and scripts)
 
       <service> is one of cache, deamon, poller
-      %s
-      * wildcards allowed, using '.' to replace 0 or more arbitrary characters in <instance>
+%(legend)s
 
     to be done after the experiment:
       nicos copy                         (copy data and scripts from link)