Merge in documentation improvements