Add to cp: fixed minor issues