minor cgp2d changes