Documentation review

For review and merge