Add citizen type, bug fix for ai.