typographic and other fixes