various formatting and minor edits