The main changes I suggest are the following:
-Mergeing Nationalistic Rebellion and Self Determination Feelings into a single Separatism Feeling.
The equation I propose is:
((1-DN)*1/(1 + exp(8-13*NAT))*(1-PAL) + (PI*PAL*politicalpower))*sqrt(1-CR)
DN is a dummy variable taking the value 1 if the govt nationality and the EG's nationality are the same and 0 otherwise.
NAT is EG's Nationalism.
politicalpower is the political power share of the social class.
PAL is Province Autonomy.
PI is Province Isolation.
CR is Civil Rights level.
-Having separate PAFs for Revolutionary Feelins for each regime instead of lumping them all together in one event. This is very important in my opinion.
-Making economics a multiplier to other effects rather than its own effect added to the other PAF's.
-Changing Poor Welfare Feeling into:
PWF=(1 - AEL)*(1 - SP)
AEL is Administration Efectiveness Level.
SP is Social Policy level.
This might need work if SP is 1 and AEL is 0 though.
One PAF has only one effect, and the more sever the PAF, the more severe the effect.
I also simplified several equations which I felt were too complex and made some changes to the civil war and internal conflict parts.