Added traits calculus
Added military population, and changed population calculus