ELPA cleanup
NXHtml changes