Restored risk validation as it was
Changed a progress message
Small fixes