Some additions/improvements to Supply spec.

Subject to review, of course.