Index: session.scm
==================================================================
--- session.scm
+++ session.scm
@@ -548,11 +548,12 @@
 		all-keys))) ;; process all keys
 	   (list "*sessionvars*" "*globalvars*" page-name))))))
 
 ;; (pg:sql-null-object? element)
 (define (session:read-config self)
-  (let ((name (string-append "." (pathname-file (car (argv))) ".config")))
+  (let* ((cgi-path (pathname-directory (car (argv))))
+         (name     (string-append (if cgi-path (conc cgi-path "/") "") "." (pathname-file (car (argv))) ".config")))
     (if (not (file-exists? name))
 	(print name " not found at " (current-directory))
 	(let* ((fp (open-input-file name))
 	       (initargs (read fp)))
 	  (close-input-port fp)

Index: stml.scm
==================================================================
--- stml.scm
+++ stml.scm
@@ -75,10 +75,12 @@
 (define (s:input  . args) (s:common-tag "INPUT"  args))
 (define (s:link   . args) (s:common-tag "LINK"   args))
 (define (s:p      . args) (s:common-tag "P"      args))
 (define (s:strong . args) (s:common-tag "STRONG" args))
 (define (s:table  . args) (s:common-tag "TABLE"  args))
+(define (s:tbody  . args) (s:common-tag "TBODY"  args))
+(define (s:thead  . args) (s:common-tag "THEAD"  args))
 (define (s:td     . args) (s:common-tag "TD"     args))
 (define (s:title  . args) (s:common-tag "TITLE"  args))
 (define (s:tr     . args) (s:common-tag "TR"     args))
 (define (s:small  . args) (s:common-tag "SMALL"  args))
 (define (s:quote  . args) (s:common-tag "QUOTE"  args))