Doc improvements
Merge tools