various updates
bug fixes
Merge branch 'master' of https://github.com/andrewchambers/cc