re-format the inline drafting comments; fix some line-wrapping