Adding ability to change scale extent on matrix plus some other small changes. Ignore the aggregate stuff for now, WIP