More review on PR 2081

More review work and some new documentation.