Docs improvements

Some docs improvements solving some issues.
Done with 454a2715707d83a3065197c1f4904bc30f7bcf67