Index: Makefile
==================================================================
--- Makefile
+++ Makefile
@@ -483,24 +483,24 @@
 
 #  "(define (toplevel-command . a) #f)"
 # if egrep 'version.*3.0' $(shell dirname $(shell dirname $(shell which csi)))/lib/chicken/7/readline.setup-info;then \
 
 readline-fix.scm :
-	if [[ $(shell chicken-status | grep readline | awk '{print $4}' | cut -d. -f1) -gt 3 ]];then \
+	if [[ $(shell chicken-status | grep breadline | awk '{print $4}' | cut -d. -f1) -gt 3 ]];then \
 	   echo "(define *use-new-readline* #f)" > readline-fix.scm; \
 	else \
 	   echo "(define *use-new-readline* #t)" > readline-fix.scm;\
 	fi
 
 altdb.scm :
 	echo ";; optional alternate db setup" > altdb.scm
 	echo "(define *available-db* (make-hash-table))" >> altdb.scm
-	if  csi -ne '(use mysql-client)';then \
-           echo "(use mysql-client)(hash-table-set! *available-db* 'mysql #t)" >> altdb.scm; \
+	if  csi -ne '(import mysql-client)';then \
+           echo "(import mysql-client)(hash-table-set! *available-db* 'mysql #t)" >> altdb.scm; \
 	fi
-	if csi -ne '(use postgresql)';then \
-	   echo "(use postgresql)(hash-table-set! *available-db* 'postgresql #t)" >> altdb.scm;\
+	if csi -ne '(import postgresql)';then \
+	   echo "(import postgresql)(hash-table-set! *available-db* 'postgresql #t)" >> altdb.scm;\
 	fi
 
 portlogger-example : portlogger-example.scm api.o archive.o client.o common.o configf.o dashboard-tests.o dashboard-context-menu.o db.o dcommon.o ezsteps.o filedb.o genexample.o http-transport.o items.o keys.o launch.o lock-queue.o margs.o megatest-version.o mt.o ods.o portlogger.o process.o rmt.o rpc-transport.o runconfig.o runs.o sdb.o server.o synchash.o tasks.o tdb.o tests.o tree.o
 	csc $(CSCOPTS) portlogger-example.scm api.o archive.o client.o common.o configf.o dashboard-tests.o dashboard-context-menu.o db.o dcommon.o ezsteps.o filedb.o genexample.o http-transport.o items.o keys.o launch.o lock-queue.o margs.o megatest-version.o mt.o ods.o portlogger.o process.o rmt.o rpc-transport.o runconfig.o runs.o sdb.o server.o synchash.o tasks.o tdb.o tests.o tree.o
 

Index: commonmod.scm
==================================================================
--- commonmod.scm
+++ commonmod.scm
@@ -54,11 +54,11 @@
      md5 
      message-digest
      z3
      directory-utils
      system-information
-     ;;sparse-vectors
+     sparse-vectors
 )
 
 (import pkts)
 (import	(prefix mtconfigf configf:))
 (import	(prefix mtargs args:))

Index: mutils/mutils.scm
==================================================================
--- mutils/mutils.scm
+++ mutils/mutils.scm
@@ -12,17 +12,16 @@
 ;;
 
 (module mutils
     *
 
-  (import chicken scheme
+  (import (chicken  base) (chicken io) scheme
 	  ;; data-structures posix
 	  srfi-1
 	  ;; srfi-13
 	  srfi-69
 	  ;; ports
-	  extras
 	  regex
 	  )
 
 (define (mutils:hierhash-ref hh . keys)
   (if (null? keys)
@@ -87,11 +86,11 @@
 	  (if (or (string-match comment l)
 		  (string-match blank l))
 	      (loop (read-line fh) res)
 	      (loop (read-line fh) (cons l res)))))))
 
-(use sparse-vectors)
+(import sparse-vectors)
 
 ;; this is a simple two dimensional sparse array
 
 ;; ONLY TWO DIMENSIONS!!! SEE ARRAY-LIB IF YOUR NEEDS ARE GREATER!!
 ;;

Index: pgdbmod.scm
==================================================================
--- pgdbmod.scm
+++ pgdbmod.scm
@@ -24,12 +24,12 @@
 (declare (uses mtargs))
 
 (module pgdbmod
 	*
 	
-(import scheme chicken data-structures extras files)
-(use posix
+(import scheme (chicken base) (chicken file) (chicken string) (chicken sort) (chicken condition) (chicken string))
+(import 
      (prefix dbi dbi:)
      srfi-69 srfi-1 typed-records)
 
 (import (prefix mtconfigf configf:))
 (import	(prefix mtargs    args:))

Index: stml2/stml2.scm
==================================================================
--- stml2/stml2.scm
+++ stml2/stml2.scm
@@ -12,17 +12,17 @@
 ;; (declare (unit stml))
 
 (module stml2
     *
 
-(import (chicken base) scheme queues srfi-13 (chicken port) (chicken io) (chicken file) srfi-69 srfi-1 (chicken condition)) 
+(import (chicken random) (chicken base) (chicken string) (chicken time) scheme queues srfi-13 (chicken port) (chicken io) (chicken file) srfi-69 srfi-1 (chicken condition) (chicken time posix) (chicken process-context posix) (chicken pathname) (chicken blob) (chicken format) (chicken process) (chicken process-context)) 
 
 (import cookie)
 (import (prefix dbi dbi:) (prefix crypt c:) typed-records)
 
 ;; (declare (uses misc-stml))
-(use regex)
+(import regex)
 
 ;; The (usually global) sdat contains everything about the session
 ;;
 (defstruct sdat
   ;; database
@@ -421,11 +421,11 @@
 ;;  (s:get-key 'n 1)     => "n99e1882" n=number 99e is the week number since 1970, remainder is random
 ;;  (s:key->val "n1882") => 1
 ;;
 ;;  first letter is a type: n=number, s=string, b=boolean
 (define (s:get-key key-type val)
-  (let ((mkrandstr (lambda (innum)(number->string (random innum) 16)))
+  (let ((mkrandstr (lambda (innum)(number->string (pseudo-random-integer innum) 16)))
 	(week      (number->string (quotient (current-seconds) (* 7 24 60 60)) 16)))
     (let loop ((siz 1000)
 	       (key (conc key-type week (mkrandstr 100)))
 	       (num 0))
       (if (s:session-var-get key) ;; have a collision
@@ -649,11 +649,11 @@
 
 #;(define (session:get-nth-char nth)
   (substring session:valid-chars nth  (+ nth 1)))
 
 #;(define (session:get-rand-char)
-  (session:get-nth-char (random session:num-valid-chars)))
+  (session:get-nth-char (pseudo-random-integer session:num-valid-chars)))
 
 #;(define (session:make-rand-string len)
   (let loop ((res "")
              (n   1))
     (if (> n len) res
@@ -664,11 +664,11 @@
 ;;
 #;(define (session:generic-make-rand-string len seed-string)
   (let ((num-chars (string-length seed-string)))
     (let loop ((res "")
 	       (n   1))
-      (let ((char-num (random num-chars)))
+      (let ((char-num (pseudo-random-integer num-chars)))
 	(if (> n len) res
 	    (loop (string-append res (substring seed-string char-num (+ char-num 1)))
 		  (+ n 1)))))))
 
 ;; Rely on crypt egg's default settings being secure enough, accept
@@ -1429,11 +1429,11 @@
 
 (define (session:get-nth-char nth)
   (substring session:valid-chars nth  (+ nth 1)))
 
 (define (session:get-rand-char)
-  (session:get-nth-char (random session:num-valid-chars)))
+  (session:get-nth-char (pseudo-random-integer session:num-valid-chars)))
 
 (define (session:make-rand-string len)
   (let loop ((res "")
              (n   1))
     (if (> n len) res
@@ -1444,11 +1444,11 @@
 ;;
 (define (session:generic-make-rand-string len seed-string)
   (let ((num-chars (string-length seed-string)))
     (let loop ((res "")
 	       (n   1))
-      (let ((char-num (random num-chars)))
+      (let ((char-num (pseudo-random-integer num-chars)))
 	(if (> n len) res
 	    (loop (string-append res (substring seed-string char-num (+ char-num 1)))
 		  (+ n 1)))))))
 
 
@@ -1707,11 +1707,11 @@
 	  ;; The 'auto method will distribute dbs across the disk using hash
 	  ;; of user host and user. TODO
 	  ;; (if (eq? dbfname 'auto) ;; This is the auto assignment of a db based on hash of IP
 	  (let ((dbpath (pathname-directory dbfname)))  ;; do a couple sanity checks here to make setting up easier
 	    (if debugmode (session:log self "INFO: setting up for sqlite3 db access to " dbfname))
-	    (if (not (file-write-access? dbpath))
+	    (if (not (file-writable? dbpath))
 		(session:log self "WARNING: Cannot write to " dbpath)
 		(if debugmode (session:log self "INFO: " dbpath " is writeable")))
 	    (if (file-exists? dbfname)
 		(begin
 		  ;; (session:log self "setting dbexists to #t")

Index: tasksmod.scm
==================================================================
--- tasksmod.scm
+++ tasksmod.scm
@@ -25,12 +25,12 @@
 (declare (uses mtconfigf))
 
 (module tasksmod
 	*
 	
-(import scheme chicken data-structures extras)
-(use (prefix sqlite3 sqlite3:) posix typed-records srfi-18 srfi-69 format ports srfi-1 matchable
+(import scheme (chicken base) (chicken condition) (chicken string) (chicken process) (chicken process-context) (chicken process-context posix) (chicken file) (chicken file posix) system-information )
+(import (prefix sqlite3 sqlite3:) typed-records srfi-18 srfi-69 format srfi-1 matchable
 	regex)
 
 (import commonmod)
 (import	(prefix mtconfigf configf:))
 (import	pgdbmod)
@@ -116,15 +116,15 @@
 	     (debug:print 5 *default-log-port* " exn=" (condition->list exn))))
        (let* ((dbpath        (db:dbfile-path )) ;; (tasks:get-task-db-path))
 	      (dbfile       (conc dbpath "/monitor.db"))
 	      (avail        (tasks:wait-on-journal dbpath 10)) ;; wait up to about 10 seconds for the journal to go away
 	      (exists       (common:file-exists? dbpath))
-	      (write-access (file-write-access? dbpath))
+	      (write-access (file-writable? dbpath))
 	      (mdb          (cond ;; what the hek is *toppath* doing here?
-			     ((and (string? *toppath*)(file-write-access? *toppath*))
+			     ((and (string? *toppath*)(file-writable? *toppath*))
 			      (sqlite3:open-database dbfile))
-			     ((file-read-access? dbpath)    (sqlite3:open-database dbfile))
+			     ((file-readable? dbpath)    (sqlite3:open-database dbfile))
 			     (else (sqlite3:open-database ":memory:")))) ;; (never-give-up-open-db dbpath))
 	      (handler      (sqlite3:make-busy-timeout 36000)))
 	 (if (and exists
 		  (not write-access))
 	     (set! *db-write-access* write-access)) ;; only unset so other db's also can use this control
@@ -200,27 +200,27 @@
 
 ;; no elegance here ...
 ;;
 (define (tasks:kill-server hostname pid #!key (kill-switch ""))
   (debug:print-info 0 *default-log-port* "Attempting to kill server process " pid " on host " hostname)
-  (setenv "TARGETHOST" hostname)
+  (set-environment-variable! "TARGETHOST" hostname)
   (let* ((logdir (if (directory-exists? "logs")
                     "logs/"
                     ""))
          (logfile (if logdir (conc "logs/server-"pid"-"hostname".log") #f))
          (gzfile  (if logfile (conc logfile ".gz"))))
-    (setenv "TARGETHOST_LOGF" (conc logdir "server-kills.log"))
+    (set-environment-variable! "TARGETHOST_LOGF" (conc logdir "server-kills.log"))
 
     (system (conc "nbfake kill "kill-switch" "pid))
 
     (when logfile
       (thread-sleep! 0.5)
       (if (common:file-exists? gzfile) (delete-file gzfile))
       (system (conc "gzip " logfile))
       
-      (unsetenv "TARGETHOST_LOGF")
-      (unsetenv "TARGETHOST"))))
+      (unset-environment-variable! "TARGETHOST_LOGF")
+      (unset-environment-variable! "TARGETHOST"))))
     
  
 ;;======================================================================
 ;; M O N I T O R S
 ;;======================================================================