Added a few of my own changes to the spec.