Docs improvements

Some docs improvements solving some issues.
Done with 691cefed56a319aaf63752bd8ba892f9e15bb287