add PlainHtmlElemMacro; refactor some code;