Fix some references; add HTML.