more numbering fixes