More expository, markup fixes