Fixed construtor issue, run fml's sourc cleanup over CB, and some manual srg and exc fixes. Seems this is the cleanest we're gunna get it.