Calc chap

Improved disaggregation figures and fixed citations