Guide doc improvement

The latest documentation improvements to merge in master.