Fixed some stuff in calculation and added stuff

Calculation now handles a summary and spreads results to csb and
deliverer beans for statistics and other output.