diff --git a/twander.py b/twander.py
index c92817a..1520cd9 100755
--- a/twander.py
+++ b/twander.py
@@ -4,7 +4,7 @@
 
 
 PROGNAME = "twander"
-RCSID = "$Id: twander.py,v 1.21 2002/10/29 23:12:31 tundra Exp $"
+RCSID = "$Id: twander.py,v 1.22 2002/10/30 00:00:23 tundra Exp $"
 VERSION = RCSID.split()[2]
 
 
@@ -244,7 +244,10 @@
                 cf.close()
                 sys.exit(1)
                 
-            rcfile[key] = " ".join(fields[1:]) # Save entry
+            # Save command name and command using key as index
+            rcfile[key] = ["".join(fields[0].split(CMDKEY)),
+                           " ".join(fields[1:])
+                          ]
 
     cf.close()
 
@@ -277,6 +280,11 @@
 #                  Program Entry Point                     #
 #----------------------------------------------------------#
 
+# Newline to make sure cursor of invoking window is
+# at LHS in case we get errors or warnings.
+
+print ""
+
 # Command line processing
 
 try:
@@ -320,9 +328,6 @@
 rcfile = {}
 ParseRC()
 
-print rcfile
-
-
 # Fill the control with directory contents
 DirList.items = BuildDirList(rootdir)