Erikj spec changes

Mostly fixing or removing lying bits from the spec.