In CPSO: Added  and  overrides. Bug fixes.