html and other fixes