doc-252, doc-231, + link corrections