@@ -180,19 +180,20 @@
 (define (tasks:server-set-available mdb run-id)
   (sqlite3:execute 
    mdb 
    "INSERT INTO servers (pid,hostname,port,pubport,start_time,      priority,state,mt_version,heartbeat,   interface,transport,run_id)
                    VALUES(?, ?,       ?,   ?, strftime('%s','now'), ?,       ?,    ?,-1,?,        ?,        ?);"
-   (current-process-id)       ;; pid
-   (get-host-name)            ;; hostname
-   -1                         ;; port
-   -1                         ;; pubport
-   (random 1000)              ;; priority (used a tiebreaker on get-available)
-   "available"                ;; state
-   (common:version-signature) ;; mt_version
-   -1                         ;; interface
-   "http"                     ;; transport
+   (current-process-id)          ;; pid
+   (get-host-name)               ;; hostname
+   -1                            ;; port
+   -1                            ;; pubport
+   (random 1000)                 ;; priority (used a tiebreaker on get-available)
+   "available"                   ;; state
+   (common:version-signature)    ;; mt_version
+   -1                            ;; interface
+   ;; (conc (server:get-transport)) ;; transport
+   (conc *transport-type*)    ;; transport
    run-id
    ))
 
 (define (tasks:num-in-available-state mdb run-id)
   (let ((res 0))
@@ -364,15 +365,15 @@
 	(maxqry (cdr (rmt:get-max-query-average run-id)))
 	(threshold   (string->number (or (configf:lookup *configdat* "server" "server-query-threshold") "10"))))
     (cond
      (forced 
       (if (common:low-noise-print 60 run-id "server required is set")
-	  (debug:print-info 0 "Server required is set, starting server."))
+	  (debug:print-info 0 "Server required is set, starting server for run-id " run-id "."))
       #t)
      ((> maxqry threshold)
       (if (common:low-noise-print 60 run-id "Max query time execeeded")
-	  (debug:print-info 0 "Max avg query time of " maxqry "ms exceeds limit of " threshold "ms, starting server."))
+	  (debug:print-info 0 "Max avg query time of " maxqry "ms exceeds limit of " threshold "ms, server needed for run-id " run-id "."))
       #t)
      (else
       #f))))
 
 ;; try to start a server and wait for it to be available
@@ -384,12 +385,13 @@
       (if (and (not server-dat)
 	       (< delay-time delay-max-tries))
 	  (begin
 	    (if (common:low-noise-print 60 "tasks:start-and-wait-for-server" run-id)
 		(debug:print 0 "Try starting server for run-id " run-id))
+	    (thread-sleep! (/ (random 2000) 1000))
 	    (server:kind-run run-id)
-	    (thread-sleep! (min delay-time 5))
+	    (thread-sleep! (min delay-time 1))
 	    (loop (tasks:get-server (db:delay-if-busy tdbdat) run-id)(+ delay-time 1))))))
 
 (define (tasks:get-all-servers mdb)
   (let ((res '()))
     (sqlite3:for-each-row