@@ -68,11 +68,11 @@
 					   ;; (string-intersperse (map number->string (u8vector->list (hostname->ip hostname))) ".")
 					   (server:get-best-guess-address hostname)
 					   #f)))
 			    (if ipstr ipstr hostn))) ;; hostname))) 
 	 (start-port      (open-run-close tasks:server-get-next-port tasks:open-db))
-	 (link-tree-path  (config-lookup *configdat* "setup" "linktree")))
+	 (link-tree-path  (configf:lookup *configdat* "setup" "linktree")))
     (set! db *inmemdb*)
     (root-path     (if link-tree-path 
 		       link-tree-path
 		       (current-directory))) ;; WARNING: SECURITY HOLE. FIX ASAP!
     (handle-directory spiffy-directory-listing)
@@ -127,15 +127,15 @@
 				  ((equal? (uri-path (request-uri (current-request))) 
 					   '(/ "hey"))
 				   (send-response body: "hey there!\n"
 						  headers: '((content-type text/plain))))
 				  (else (continue))))))))
-    (http-transport:try-start-server ipaddrstr start-port server-id)))
+    (http-transport:try-start-server run-id ipaddrstr start-port server-id)))
 
 ;; This is recursively run by http-transport:run until sucessful
 ;;
-(define (http-transport:try-start-server ipaddrstr portnum server-id)
+(define (http-transport:try-start-server run-id ipaddrstr portnum server-id)
   (handle-exceptions
    exn
    (begin
      (print-error-message exn)
      (if (< portnum 9000)
@@ -143,11 +143,11 @@
 	   (debug:print 0 "WARNING: failed to start on portnum: " portnum ", trying next port")
 	   (thread-sleep! 0.1)
 
 	   ;; get_next_port goes here
 
-	   (http-transport:try-start-server ipaddrstr (+ portnum 1) server-id))
+	   (http-transport:try-start-server run-id ipaddrstr (+ portnum 1) server-id))
 	 (begin
 	   (open-run-close tasks:server-force-clean-run-record tasks:open-db run-id ipaddrstr portnum " http-transport:try-start-server")
 	   (print "ERROR: Tried and tried but could not start the server"))))
    ;; any error in following steps will result in a retry
    (set! *server-info* (list ipaddrstr portnum))
@@ -156,11 +156,12 @@
 		   server-id 
 		   ipaddrstr portnum)
    (debug:print 1 "INFO: Trying to start server on " ipaddrstr ":" portnum)
    ;; This starts the spiffy server
    ;; NEED WAY TO SET IP TO #f TO BIND ALL
-   (start-server bind-address: ipaddrstr port: portnum)
+   (start-server ;; bind-address: ipaddrstr
+		 port: portnum)
    (open-run-close tasks:server-force-clean-run-record tasks:open-db run-id ipaddrstr portnum " http-transport:try-start-server")
    (debug:print 1 "INFO: server has been stopped")))
 
 ;;======================================================================
 ;; S E R V E R   U T I L I T I E S 
@@ -268,11 +269,13 @@
 ;;
 ;; connect
 ;;
 (define (http-transport:client-connect iface port)
   (let* ((uri-dat     (make-request method: 'POST uri: (uri-reference (conc "http://" iface ":" port "/ctrl"))))
+	 ;; (uri-dat     (make-request method: 'GET uri: (uri-reference (conc "http://" iface ":" port "/ctrl"))))
 	 (uri-api-dat (make-request method: 'POST uri: (uri-reference (conc "http://" iface ":" port "/api"))))
+	 ;; (uri-api-dat (make-request method: 'GET uri: (uri-reference (conc "http://" iface ":" port "/api"))))
 	 (server-dat  (list iface port uri-dat uri-api-dat)))
 ;;	 (login-res   (server:ping-server run-id server-dat))) ;; login-no-auto-client-setup server-dat run-id)))
     server-dat))
 ;;     (if (and (list? login-res)
 ;; 	     (car login-res))
@@ -310,11 +313,11 @@
 				      sdat))))))
          (iface       (car server-info))
          (port        (cadr server-info))
          (last-access 0)
 	 (tdb         (tasks:open-db))
-	 (server-timeout (let ((tmo (config-lookup  *configdat* "server" "timeout")))
+	 (server-timeout (let ((tmo (configf:lookup  *configdat* "server" "timeout")))
 			   (if (and (string? tmo)
 				    (string->number tmo))
 			       (* 60 60 (string->number tmo))
 			       ;; (* 3 24 60 60) ;; default to three days
 			       ;; (* 60 1)         ;; default to one minute