You've edited stuff about right.

Another question: can I take ethnicity traits from factions that are still alive? What would happen to AI's FMs having these ethnicities?
I wouldn't try it, weird stuff would probably happen, since you're taking away a trait from a guy that is still alive. Weeeeird stuff.