Doc improvements after last code review