Last matrix changes before going ES 2.0
Small improvements.