Adding contexts, choice, and examples. Some renaming.