Issue #513 Message documentation and minor reorganization/fixes