Fix indentation
Fix return.multiple.matrices and list of matrices