Fix MatrixPram handling. Some formatting.