CS Fixes
Merge pull request #7 from Hounddog/cs_fixes

CS Fixes