@@ -121,11 +121,11 @@
 						    "             extra)))"))
 				((get g)   
 				 (let* ((parts (string-split cmd))
 					(sect  (car parts))
 					(var   (cadr parts)))
-				   (conc "(lambda (ht)(config-lookup ht \"" sect "\" \"" var "\"))")))
+				   (conc "(lambda (ht)(configf:lookup ht \"" sect "\" \"" var "\"))")))
 				((runconfigs-get rget) (conc "(lambda (ht)(runconfigs-get ht \"" cmd "\"))"))
 				;; ((rget)           (conc "(lambda (ht)(runconfigs-get ht \"" cmd "\"))"))
 				(else "(lambda (ht)(print \"ERROR\") \"ERROR\")"))))
 		;; (print "fullcmd=" fullcmd)
 		(handle-exceptions
@@ -463,11 +463,11 @@
 	       ;; if a continued line
 	       (configf:cont-ln-rx ( x whsp val     )
                                    (let ((alist (hash-table-ref/default res curr-section-name '())))
                                      (if var-flag             ;; if set to a string then we have a continued var
                                          (let ((newval (conc 
-                                                        (config-lookup res curr-section-name var-flag) "\n"
+                                                        (configf:lookup res curr-section-name var-flag) "\n"
                                                         ;; trim lead from the incoming whsp to support some indenting.
                                                         (if lead
                                                             (string-substitute (regexp lead) "" whsp)
                                                             "")
                                                         val)))
@@ -498,11 +498,11 @@
     (let ((configdat  (if configfile 
 			  (read-config configfile #f #t environ-patt: environ-patt post-section-procs: (list (cons "^fields$" set-fields)) #f))))
       (if toppath (change-directory curr-dir))
       (list configdat toppath configfile fname))))
 
-(define (config-lookup cfgdat section var)
+(define (configf:lookup cfgdat section var)
   (if (hash-table? cfgdat)
       (let ((sectdat (hash-table-ref/default cfgdat section '())))
 	(if (null? sectdat)
 	    #f
 	    (let ((match (assoc var sectdat)))
@@ -519,11 +519,11 @@
 ;;  (configf:var-is? cfgdat "foo" "var" "yes") => #t
 ;;
 (define (configf:var-is? cfgdat section var expected-val)
   (equal? (configf:lookup cfgdat section var) expected-val))
 
-(define configf:lookup config-lookup)
+(define config-lookup configf:lookup)
 (define configf:read-file read-config)
 
 ;; safely look up a value that is expected to be a number, return
 ;; a default (#f unless provided)
 ;;
@@ -634,11 +634,11 @@
 	 (sechash (make-hash-table)) ;; current section hash, init with hash for "default" section
 	 (new     #f) ;; put the line to be used in new, if it is to be deleted the set new to #f
 	 (secname #f))
 
     ;; step 2: Flatten multiline entries
-    (if (not (null? fdat))(set! fdat (configf:compress-multi-line fdat)))
+    (if (not (null? fdat))(set! fdat (configf:compress-multi-lines fdat)))
 
     ;; step 3: Modify values per contents of "indat" and remove absent values
     (if (not (null? fdat))
 	(let loop ((hed  (car fdat))
 		   (tal  (cadr fdat))
@@ -649,19 +649,19 @@
 	   (configf:comment-rx _                  (set! res (append res (list hed)))) ;; (loop (read-line inp) curr-section-name #f #f))
 	   (configf:blank-l-rx _                  (set! res (append res (list hed)))) ;; (loop (read-line inp) curr-section-name #f #f))
 	   (configf:section-rx ( x section-name ) (let ((section-hash (hash-table-ref/default refdat section-name #f)))
 					    (if (not section-hash)
 						(let ((newhash (make-hash-table)))
-						  (hash-table-set! refhash section-name newhash)
+						  (hash-table-set! refdat section-name newhash) ;; was refhash - not sure that refdat is correct here
 						  (set! sechash newhash))
 						(set! sechash section-hash))
 					    (set! new hed) ;; will append this at the bottom of the loop
 					    (set! secname section-name)
 					    ))
 	   ;; No need to process key cmd, let it fall though to key val
 	   (configf:key-val-pr ( x key val      )
-		       (let ((newval (config-lookup indat sec key)))
+		       (let ((newval (configf:lookup indat secname key))) ;; was sec, bug or correct?
 			 ;; can handle newval == #f here => that means key is removed
 			 (cond 
 			  ((equal? newval val)
 			   (set! res (append res (list hed))))
 			  ((not newval) ;; key has been removed
@@ -683,18 +683,18 @@
      (lambda (section)
        (let ((sdat   '()) ;; append needed bits here
 	     (svars  (configf:section-vars indat section)))
 	 (for-each 
 	  (lambda (var)
-	    (let ((val (config-lookup refdat section var)))
+	    (let ((val (configf:lookup refdat section var)))
 	      (if (not val) ;; this one is new
 		  (begin
 		    (if (null? sdat)(set! sdat (list (conc "[" section "]"))))
 		    (set! sdat (append sdat (list (conc var " " val))))))))
 	  svars)
 	 (set! fdat (append fdat sdat))))
-     (delete-duplicates (append require-sections (hash-table-keys indat))))
+     (delete-duplicates (append required-sections (hash-table-keys indat))))
 
     ;; step 5: Write out new file
     (with-output-to-file fname 
       (lambda ()
 	(for-each