Cs fixes
Merge pull request #37 from tersmitten/cs-fixes

Cs fixes