Index: common.scm
==================================================================
--- common.scm
+++ common.scm
@@ -46,17 +46,19 @@
 (define *megatest-db*       #f)
 (define *rpc:listener*      #f) ;; if set up for server communication this will hold the tcp port
 (define *runremote*         #f) ;; if set up for server communication this will hold <host port>
 (define *last-db-access*    (current-seconds))  ;; update when db is accessed via server
 (define *max-cache-size*    0)
-(define *logged-in-clients* (make-hash-table))
+;; *logged-in-clients* NOT IN USE, REMOVE?
+;; (define *logged-in-clients* (make-hash-table))
 (define *client-non-blocking-mode* #f)
 (define *server-id*         #f)
 (define *server-info*       #f)
 (define *time-to-exit*      #f)
 (define *received-response* #f)
 (define *default-numtries*  10)
+(define *current-query-count* 0)
 
 (define *target*            (make-hash-table)) ;; cache the target here; target is keyval1/keyval2/.../keyvalN
 (define *keys*              (make-hash-table)) ;; cache the keys here
 (define *keyvals*           (make-hash-table))
 (define *toptest-paths*     (make-hash-table)) ;; cache toptest path settings here

Index: db.scm
==================================================================
--- db.scm
+++ db.scm
@@ -1415,11 +1415,12 @@
 		   (calling-vers (cadr  params))
 		   (client-key   (caddr params)))
 	       (if (and (equal? calling-path *toppath*)
 			(equal? megatest-version calling-vers))
 		   (begin
-		     (hash-table-set! *logged-in-clients* client-key (current-seconds))
+		     ;; *logged-in-clients* NOT IN USE, REMOVE?
+		     ;; (hash-table-set! *logged-in-clients* client-key (current-seconds))
 		     (server:reply return-address qry-sig #t '(#t "successful login")))      ;; path matches - pass! Should vet the caller at this time ...
 		   (server:reply return-address qry-sig #f (list #f (conc "Login failed due to mismatch paths: " calling-path ", " *toppath*)))))))
 	((flush sync)
 	 (server:reply return-address qry-sig #t 1)) ;; (length data)))
 	((set-verbosity)

Index: http-transport.scm
==================================================================
--- http-transport.scm
+++ http-transport.scm
@@ -31,12 +31,13 @@
 (define (http-transport:make-server-url hostport)
   (if (not hostport)
       #f
       (conc "http://" (car hostport) ":" (cadr hostport))))
 
-(define  *server-loop-heart-beat* (current-seconds))
-(define *heartbeat-mutex* (make-mutex))
+(define *server-loop-heart-beat* (current-seconds))
+(define *heartbeat-mutex*        (make-mutex))
+(define *query-count-mutex*      (make-mutex))
 
 ;;======================================================================
 ;; S E R V E R
 ;;======================================================================
 
@@ -85,13 +86,15 @@
 						  headers: '((content-type text/plain))))
 				  ;; This is the /ctrl path where data is handed to the server and
 				  ;; responses 
 				  ((equal? (uri-path (request-uri (current-request)))
 					   '(/ "ctrl"))
+				   
 				   (let* ((packet (db:string->obj dat))
 					  (qtype  (cdb:packet-get-qtype packet)))
 				     (debug:print-info 12 "server=> received packet=" packet)
+
 				     (if (not (member qtype '(sync ping)))
 					 (begin
 					   (mutex-lock! *heartbeat-mutex*)
 					   (set! *last-db-access* (current-seconds))
 					   (mutex-unlock! *heartbeat-mutex*)))
@@ -266,11 +269,11 @@
 	    (exit))))
   (debug:print-info 2 "Starting the standalone server")
   (let ((hostinfo (open-run-close tasks:get-best-server tasks:open-db)))
     (debug:print 11 "http-transport:launch hostinfo=" hostinfo)
     (if hostinfo
-	(debug:print-info 2 "NOT starting new server, one is already running on " (car hostinfo) ":" (cadr hostinfo))
+	(debug:print-info 2 "NOT starting new server, one is already running on " (vector-ref hostinfo 1) ":" (vector-ref hostinfo 2))
 	(if *toppath* 
 	    (let* ((th2 (make-thread (lambda ()
 				       (http-transport:run 
 					(if (args:get-arg "-server")
 					    (args:get-arg "-server")