GM and other fixes.
Merge branch 'master' of https://github.com/laaph/candy