Update some bits.
Merge pull request #181 from bar/cake3

Update some bits.