CS Fixes

Is there any chance we could have a 0.1.1 release tag after this? There's been quite a lot of other stuff since 0.1.0 was tagged.