Index: stml2.scm
==================================================================
--- stml2.scm
+++ stml2.scm
@@ -207,11 +207,11 @@
 ;; fix that later ...
 (define (s:optgroup dat)
   (let ((label (car dat))
 	(rem   (cdr dat)))
     (if (null? rem)
-	(s:common-tag "OPTGROUP" 'label label)
+	(s:common-tag "OPTGROUP" `('label ,label))
 	(let loop ((hed (car rem))
 		   (tal (cdr rem))
 		   (res (list (conc "<OPTGROUP label=" label))))
 	  ;; (print "hed: " hed " tal: " tal " res: " res)
 	  (let ((new (append res (list (if (list? (cadr hed))
@@ -936,11 +936,12 @@
   (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))
+	       ;; (result (read-string (caar index) datstr))
+	       (result (read-string index datstr))
 	       (remdat (read-string #f datstr)))
 	  (close-input-port datstr)
 	  (list result remdat)))))
 
  ;; inp is port to read data from, maxsize is max data allowed to read (total)
@@ -2437,13 +2438,13 @@
   (session:curr-page-set! s:session key val))
 
 (define (s:del! key)
   (session:page-var-del! s:session key))
 
-(define (s:get-n-del! key)
+#;(define (s:get-n-del! key)
   (let ((val (session:page-get s:session key)))
-    (session:del! s:session key)
+    (session:del! s:session val key)
     val))
 
 ;; these are session wide
 (define (s:session-var-get key . params) 
   (session:get s:session "*sessionvars*" key params))