Spencer's edits, and a few of mine