updated HtmlWriter