(minor) Changes to the OPI Calculator