Docs improvements

Some docs improvements solving some issues.
Done with 37ea668b3dbc9e9311df02bc525d2b805ab6b3ed