Fixed Zach's CP errors.
Merge branch 'master' of https://github.com/Hervature/excalibur
Fixed more of Zach's CP errors.