expanded Matrix trait with +| and *| operators
fixed compile errors