Second part of review 1001

@atnnn this is the second part of the review 1001 for the new docs.