[Gnorman]

Points duly noted, and the d6 HD will remain. I think light armor proficiency will also stick around, as my concession for the reduced spell lists.

Black mage has been converted to core and Fiendish Familiar has been removed - mages probably shouldn't get to be two characters in one, and there's always Obtain Familiar if they can't live without it. This will also mean that the Elementalist green mage will have his companion removed, when I get to it.