Minor fixes. Add .html_safe to output.