@@ -268,18 +268,18 @@
 (define (dbfile:run-id->dbfname run-id)
   (conc (dbfile:run-id->dbnum run-id)".db"))
 
 ;; the path in MTRAH with the filename
 (define (dbfile:run-id->dbname run-id)
-  (conc ".mtdb/"(dbfile:run-id->dbfname run-id)))
+  (conc (dbfile:run-id->dbfname run-id)))
 
 
 ;; Make the dbstruct, setup up auxillary db's and call for main db at least once
 ;;
 ;; called in http-transport and replicated in rmt.scm for *local* access. 
 ;;
-(define (dbfile:setup do-sync areapath tmppath)
+(define (dbfile:setup areapath tmppath)
   (cond
    (*dbstruct-dbs*
     (dbfile:print-err "WARNING: dbfile:setup called when *dbstruct-dbs* is already initialized")
     *dbstruct-dbs*) ;; TODO: when multiple areas are supported, this optimization will be a hazard
    (else
@@ -359,11 +359,12 @@
 	  (if dbdat
 	      dbdat
 	      (let* ((tmppath   (dbr:dbstruct-tmppath  dbstruct))
 		     (tmpdbpath (dbfile:run-id->path tmppath run-id))
 		     (dbdat     (dbfile:open-sqlite3-db tmpdbpath init-proc sync-mode: 0 journal-mode: "WAL")))
-		;; the following line short-circuits the "one db handle per thread" model
+		
+               ;; the following line short-circuits the "one db handle per thread" model
 		;; 
 		;; (dbfile:add-dbdat dbstruct run-id dbdat)
 		;;
 		dbdat))))))
     
@@ -454,11 +455,11 @@
                                   (let ((db (sqlite3:open-database fname)))
 				    ;; pragmas synchronous not needed because this db is used read-only
 				    ;; (sqlite3:execute db (conc "PRAGMA synchronous = "mode";")
 				    (sqlite3:set-busy-handler! db (sqlite3:make-busy-timeout 30000)) ;; read-only but still need timeout
 				    db )
-                                  (print "file doesn't exist: " fname))))
+                                  (print "cautious-open-database: file doesn't exist: " fname))))
 			(exn (io-error)
 			     (dbfile:print-err exn "ERROR: i/o error with " fname ". Check permissions, disk space etc. and try again.")
 			     (retry))
 			(exn (corrupt)
 			     (dbfile:print-err exn "ERROR: database " fname " is corrupt. Repair it to proceed.")