Rework W3C draft based on comments

I needed to rework the W3C draft based on comments+style tweaks from Nick, Roger and Robert Ransom.