Some updates of Paul Hoffman's edits