Small comment adjustments
Merge branch 'master' into cs-version