WYSIWYG added, and sanitization, without tests