Hand-tuned the guides to make them more consistent with the edits I made in the
design doc.