Task #0063: Implementing review comments. Documentation fixes.