Add better HTML support
Remove obsolete comment