Docs improvements

Some docs improvements solving some issues.
Done with 1730f0cfade25d1058a2b01a8917261be8fbe2b8