Doc improvements
Manual merge