Update to reflect recent changes and discussions.

2 files changed