small improvements to support html etc