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

Cs fixes