html, other fixes