Fixes
Merge pull request #341 from GrahamForks/cs

CS Fixes And Other Fixes