Doc and note changes (integrated)

Repetitive changes confusing... This is a tidy-up commit.