Tidy up some CAP wording on a new branch

This is independent of my earlier PR #24, so may conflict; I can generate a new PR if needed.

Just tidy up some language.