Rename wrapExpresssion
Add support for unescaped HTML
- Fix some comment typos