diff --git a/scheme/httpd/surflets/surflets.scm b/scheme/httpd/surflets/surflets.scm
index 2887fed..ff19bd0 100644
--- a/scheme/httpd/surflets/surflets.scm
+++ b/scheme/httpd/surflets/surflets.scm
@@ -471,8 +471,8 @@
 			 (cond
 			  ((null? (cdr option))
 			   `(option ,option))
-			  ((XML-attribute? (cadr option)) ; w/attribs?
-			   `(option ,(cadr option) ,(car option)))
+			  ((XML-attribute? (cdr option)) ; w/attribs?
+			   `(option ,(cdr option) ,(car option)))
 			  (else
 			   (error "not an attribute" (cdr option)))))
 			(else
@@ -495,14 +495,14 @@
       (map (lambda (value)
 	     (let ((value-value (if (pair? value) (car value) value))
 		   (value-attributes (if (pair? value)
-					 (if (XML-attribute? (cadr value))
-					     (cdadr value)
-					     (error "not an attribute" cadr value))
+					 (if (XML-attribute? (cdr value))
+					     (cddr value)
+					     (error "not an attribute" cdr value))
 					 #f)))
 	       (make-input-field
 		name
 		(lambda (select)
-		  select)	;FIXME refer to list elements
+		  select)
 		`(input (@ ((type "radio")
 			    (name ,name)
 			    (value ,value-value)