fix references and numbering by MatN, add newer shortcuts