Some cleanup and CP-Variable update from PhiStar to PhiStarCP (see Berge papers and talks for more information)