Docs improvements

Some docs improvements solving some issues.
Done with 98875ddc3587bc0b4b199b40047316576e7bf322