CPK app planning: minor changes