Docs improvements

Some docs improvements solving some issues.
Done e36b1a2 and a62d69a