update addClass and removeClass
add unescapeHTML