Index: tools/config.py
===================================================================
--- tools/config.py	(revision beb39ee30d11ea37ff22e86ba249687416ff6540)
+++ tools/config.py	(revision 994cf4bfcb49a11acdd2ad73fd2a1b25d0009c34)
@@ -80,5 +80,10 @@
 
     def menu(self, text, choices, button, defopt=None):
-        return self.choice(text, [button] + choices)
+        menu = []
+        for key, descr in choices:
+            txt = key + (45-len(key))*' ' + ': ' + descr
+            menu.append((key, txt))
+            
+        return self.choice(text, [button] + menu)
         
     def choice(self, text, choices, defopt=None):
@@ -366,5 +371,6 @@
     if os.path.exists(OUTPUT):
         read_defaults(OUTPUT, defaults)
-    
+
+    # Dry run only with defaults
     varnames = parse_config(INPUT, TMPOUTPUT, DefaultDialog(dlg), defaults)
     # If not in default mode, present selection of all possibilities
@@ -372,4 +378,6 @@
         defopt = 0
         while 1:
+            # varnames contains variable names that were in the
+            # last question set
             choices = [ (x[1],defaults[x[0]]) for x in varnames ]
             res = dlg.menu('Configuration',choices,('save','Save'),defopt)
@@ -382,4 +390,7 @@
                     defopt = i
                     break
+            # Ask the user a simple question, produce output
+            # as if the user answered all the other questions
+            # with default answer
             varnames = parse_config(INPUT, TMPOUTPUT, dlg, defaults,
                                     askonly=varnames[i][0])