Few doc improvements

see the commit messages.