fixes and updates on risk