Adding numbered references and working on #3107.