raw html and other fixes