Additional work bringing up to spec for the changed matrix code.
More override and matrix updates.