Cleaned up lots of warnings. cb now compiles and runs on MacOS X
(Yosemite)