Fixed problem with clean_html putting the markup inside paragraph tags.
Fixed problem with clean_html throwing exception if markup is empty.