minor fixes, thinking about fieldsets and sanitization