first CB stuff

went through the main CB file, updated the faction CB's used there as
well as went through a number of other things I found--still more work
to be done, I think