Fixed calculations in mcct aggregate report
Added migrations, small refactoring