Fixes
Merge pull request #1 from GrahamCampbell/cs

CS Fixes And Other Fixes