diff --git a/twander.py b/twander.py
index 2052341..6c95b30 100755
--- a/twander.py
+++ b/twander.py
@@ -4,7 +4,7 @@
 
 
 PROGNAME = "twander"
-RCSID = "$Id: twander.py,v 1.49 2002/11/14 03:06:47 tundra Exp $"
+RCSID = "$Id: twander.py,v 1.50 2002/11/14 03:40:27 tundra Exp $"
 VERSION = RCSID.split()[2]
 
 
@@ -25,46 +25,64 @@
 # Defaults
 #####
 
+#####
 # Key Assignments
+#####
 
 GOHOME       = '<Control-h>'
 GOPREV       = '<Control-p>' 
 GOSTART      = '<Control-s>'
-GOUP         = '<Control-u>'
+GOUP         = '<BackSpace>'
 KEYPRESS     = '<KeyPress>'
 QUITPROG     = '<Escape>'
 SELECTKEY    = '<space>'
 SELECTMOUSE  = '<ButtonRelease-1>'
 
 
+#####
+# Default Directories
+#####
+
+# Default startup directory
+STARTDIR = "." + os.sep
+
+# Default directory for config file
+# Use $HOME if available, otherwise use starting directory
+
+HOME = os.getenv("HOME") or STARTDIR
 
 # Configuration file
+CONF   = os.path.join(HOME + "." + PROGNAME)
 
-CONF   = os.path.join(os.getenv("HOME"), # Name of default config file
-                      "." +
-                      PROGNAME
-                      )
 
+#####
 # Initial Dimensions
+#####
 
 HEIGHT = 25
 WIDTH  = 60
 
-# Starting directory
 
-ROOTDIR = "." + os.sep
-
+#####
 # Colors
+#####
+
 BCOLOR  = "black"
 FCOLOR  = "green"
 
+
+#####
 # Fonts
+#####
 
 FNAME = "Courier"
 FSZ   = 12
 FWT   = "bold"
 
-# Warnings
+
+#####
+# Enable Warnings
+#####
 
 WARN = TRUE
 
@@ -158,7 +176,7 @@
 
 
 LASTDIR      = []
-STARTDIR     = ""
+
 
 #---------------------------Code Begins Here----------------------------------#
 
@@ -351,7 +369,7 @@
     def poll(self):
 
         RefreshDirList()
-        self.DirList.after(1000, self.poll)
+        self.DirList.after(500, self.poll)
 
     # End of method 'twanderUI.poll()'
 
@@ -708,11 +726,12 @@
     sys.exit(1)
 
 if len(args) == 1:
-    ROOTDIR = args[0]
-    if not os.path.isdir(ROOTDIR):
-        ErrMsg(eBADROOT % ROOTDIR)
+    STARTDIR = args[0]
+    if not os.path.isdir(STARTDIR):
+        ErrMsg(eBADROOT % STARTDIR)
         sys.exit(1)
 
+ROOTDIR = STARTDIR
 
 # This program requires a config file
 
@@ -732,9 +751,6 @@
 # Canonicalize ROOTDIR
 ROOTDIR = os.path.abspath(ROOTDIR) + PSEP
 
-# Save the initial starting directory in case we want to return later
-STARTDIR = ROOTDIR
-
 # Initialize the UI directory listing
 LoadDirList(ROOTDIR)