Index: ulex/tests/run.scm
==================================================================
--- ulex/tests/run.scm
+++ ulex/tests/run.scm
@@ -2,29 +2,32 @@
      (prefix sqlite3 sqlite3:)
      posix
      ;; ulex-netutil rpc
      pkts
      mailbox
-     hostinfo)
+     hostinfo
+     regex
+     tcp6)
 
+(include "ulex.scm")
 ;; (use (prefix ulex ulex:))
-(if (file-exists? "ulex.scm")
-    (load "ulex.scm")
-    (load "../ulex.scm"))
+;; (if (file-exists? "ulex.scm")
+;;     (load "ulex.scm")
+;;     (load "../ulex.scm"))
 
 (use trace)
 (trace-call-sites #t)
 
 (import ulex) ;; (import (prefix ulex ulex:))
 
 (trace
  ;; find-or-setup-captain
- get-all-captain-pkts
- setup-as-captain
- get-winning-pkt
- ping
- remove-captain-pkt
+ ;; get-all-captain-pkts
+ ;; setup-as-captain
+ ;; get-winning-pkt
+ ;; ping
+ ;; remove-captain-pkt
  ;; start-server-find-port
  ;; connect-server
  )
 
 (test-begin "addresses")

Index: ulex/ulex.scm
==================================================================
--- ulex/ulex.scm
+++ ulex/ulex.scm
@@ -549,11 +549,12 @@
 (define (start-server-find-port udata-in #!optional (port 4242)(tries 0))
   (let ((udata (or udata-in (make-udat))))
     (if (udat-serv-listener udata) ;; TODO - add check that the listener is alive and ready?
 	udata
 	(let ((res (connect-server udata port)))
-	  (or res
+	  (if res
+	      res
 	      (begin
 		;; (print "Could not connect to " port)
 		(if (and (< port  65535)
 			 (< tries 10000)) ;; make this number bigger when things are working
 		    (start-server-find-port udata (+ port 1)(+ tries 1))
@@ -562,13 +563,11 @@
 (define (connect-server udata port)
   ;; (tcp-listener-socket LISTENER)(socket-name so)
   ;; sockaddr-address, sockaddr-port, sockaddr->string
   (let* ((tlsn (handle-exceptions
 		   exn
-		   (begin
-		     ;; (print "unable to connect to " port ", exn=" exn)
-		     #f)
+		   #f ;; NB// NEED BETTER HANDLING HERE ASAP
 		 (tcp-listen port 1000 #f))) ;; (tcp-listen TCPPORT [BACKLOG [HOST]])
 	 (addr (get-my-best-address))) ;; (hostinfo-addresses (host-information (current-hostname)))
     (if tlsn
 	(begin
 	  (udat-my-address-set!    udata addr)