Functional spec for billing aggregator plus fixes as result.