CS and typo fixes
Merge branch 'develop' into user