Thorough documentation fix-up