more fl-matrix changes