Docs improvements

Some docs improvements solving some issues.
Done with 72e78d616e157a4ded710102054c164fd3775832