CS fixes, typos
Merge pull request #1671 from peterkokot/patch-1

CS fixes, typos