Fixed Aggregated Cash Flows

Yield still needs fixing