Number640 fixes & bunch of changes

Some documentation fixes, renaming (NumberType -> MessageContentIndex), typo correction, etc.
(see minor changes in the individual commits)
Number640 fixes