canonical numbering seems to work now
updated man pages. passes check
Merge branch 'atom-numbering'
updated version