Docs improvements

Some docs improvements solving some issues.
protected