small tweaks to cc and prep for packagist