some more fixes to cp