TradHeli: CCComp bug fixes
TradHeli: Revised CCComp model