@@ -34,13 +34,11 @@
 			  fe
 			  (begin
 			    (create-directory (conc *toppath* "/db") #t)
 			    #f))))
 	 (sdb        (sqlite3:open-database dbpath))
-	 (handler   (make-busy-timeout (if (args:get-arg "-override-timeout")
-					   (string->number (args:get-arg "-override-timeout"))
-					   136000))))
+	 (handler   (make-busy-timeout 136000)))
     (sqlite3:set-busy-handler! sdb handler)
     (if (not dbexists)
 	(sdb:initialize sdb))
     (sqlite3:execute sdb "PRAGMA synchronous = 1;")
     sdb))
@@ -80,18 +78,20 @@
     str))
 
 ;; Numbers get passed though in both directions
 ;;
 (define (make-sdb:qry #!key (fname #f))
-  (let ((sdb    (sdb:open fname: fname))
+  (let ((sdb    #f) ;; (sdb:open fname: fname))
 	(scache (make-hash-table))
 	(icache (make-hash-table)))
     (lambda (cmd var)
-      ;; (if (not sdb)(set! sdb (sdb:open)))
+      (if (not sdb)(set! sdb (sdb:open fname: fname)))
       (case cmd
-	;; ((init)      (if (not sdb)(set! sdb (sdb:open))))
-	((finalize!) (if sdb (sqlite3:finalize! sdb)))
+	((finalize) (if sdb
+			(begin
+			  (sqlite3:finalize! sdb)
+			  (set! sdb #f))))
 	((getid)     (let ((id (if (or (number? var)
 				       (string->number var))
 				   var
 				   (sdb:string->id sdb scache var))))
 		       (if id