Spec clean on dev 4 4

This is a combination of all the changes to the specification directory by Andrew and Roger.