Support for html in article body. Various Cleanup.