many fixes on risk, assets, etc..