Minor parsing and HTML rendering corrections