Fixes
Merge pull request #1 from GrahamForks/cs

CS Fixes And Other Fixes