Docs improvements

Some docs improvements solving some issues.
And by 8509d651115bb054a37f9a3f35d985ff7f0e2667