Index: formdat.scm
==================================================================
--- formdat.scm
+++ formdat.scm
@@ -96,11 +96,11 @@
 	(loop (read-line datstr)(append header (list hs))))))
 
 ;; get the data up to the next key. if there is no key then return #f
 ;; return (dat remdat)
 (define (formdat:read-dat dat key)
-  (let ((index (string-search-positions key dat)))
+  (let ((index (substring-index key dat))) ;; (string-search-positions key dat)))
     (if (or (not index)
 	    (null? index)) ;; the key was not found
 	#f
 	(let* ((datstr (open-input-string dat))
 	       (result (read-string (caar index) datstr))

Index: session.scm
==================================================================
--- session.scm
+++ session.scm
@@ -611,11 +611,11 @@
 ;; page-dir-style is:
 ;;  'stored   => stored in executable
 ;;  'flat     => pages flat directory
 ;;  'dir      => directory tree pages/<pagename>/{view,control}.scm
 ;; parts:
-;;  'both     => load control and view (anything other than view or control
+;;  'both     => load control and view (anything other than view or control and the default)
 ;;  'view     => load view only
 ;;  'control  => load control only
 (define (session:call-parts self page #!key (parts 'both))
   (sdat-set-curr-page! self page)
   (let* ((dir-style    (sdat-get-page-dir-style self));; (equal? (sdat-get-page-dir-style self) "onedir")) ;; flag #t for onedir, #f for old style