Revise documentation according to the more comments by Nori and Tom