More psdCI and psdCalc changes