Some fixes and additions to the spec's associated with the copy change a couple of commits back.