Changes to HTML to ape unique_ptr.
Another couple of minor typos/inconsistencies.