Various CS fixes throughout
line
Revert "line"

This reverts commit e56b2674b8879c5ae198337455f8962fe0b9dcb4.
Merge pull request #11 from catchamonkey/cs_fixes

Various CS fixes throughout