Upgrade CMD to 4.0.1.
Some corrections to method names.