diff --git a/start-extended-web-server b/start-extended-web-server
index 840c4d3..a428b59 100755
--- a/start-extended-web-server
+++ b/start-extended-web-server
@@ -119,8 +119,8 @@ exec scsh -lel SSAX-4.9/load.scm -lel sunet-2.1/load.scm -dm -o http-test -e mai
 	(error "Internal error, option not found" option alist))))
 
     (define (main args)
-      (with-cwd 
-	  (file-name-directory (car (command-line)))
+      (with-cwd "."
+	  (file-name-directory (car args))
 	(let ((options (make-options-from-args (cdr args))))
 	  (cond ((zero? (user-uid))
 		 (set-gid (->gid "nobody"))
@@ -151,12 +151,15 @@ exec scsh -lel SSAX-4.9/load.scm -lel sunet-2.1/load.scm -dm -o http-test -e mai
 		   (list (cons "h" (home-dir-handler "public_html"))
 			 (cons "seval" seval-handler) 
 			 ;; You may want to adapt this to your site.
+			 ;; call like http://localhost:8080/man/man?ssh(1)
 			 (cons "man" (rman-handler 'man
 						   'nroff
 						   "/usr/bin/rman"
 						   "/usr/bin/zcat"
 						   #f "man?%s(%s)" 
 						   "Generated by rman-gateway"))
+			 ;; call like http://localhost:8080/info/info?(slib.info)Top
+			 ;; note: can only handle not-gzipped info files
 			 (cons "info" (info-handler #f #f #f
 						    "Generated by info-gateway"))
 			 (cons "cgi-bin" (cgi-handler