numerous markup and orphographic fixes