Tons of CS fixes all over the place
Merge pull request #23 from boenrobot/cs

Tons of CS fixes all over the place