Changes to the specification.

Based on feedback from today's meeting.