Docs improvements

Some docs improvements solving some issues.
Done with 9b7e1f6d6adb8c07a206b0bfadea0767b490901f