Fixed the problems with aggregate_demand and aggregate_supply ... I think.