Minor fixes in terminology in s3 & s4.
Merge branch 'master' of github.com:dohnto/CDP