cb types fixes

fixed a bracket error in CB types, also made some fixes/additions based
on what the validator picked up (including a few kingdom titles
commented out, which we'll need to re-comment in later, once the landed
titles file is in)