Minor fixes
Rearange risks
Revise risks