Small changes and update to CIR.