Tweaks to HTML output