Docs improvements

Some docs improvements solving some issues.
Done with e8833b155beb7be0857f3de67ae04a69f8211c6f and e3b0f8af1d78dd8e361a8633fcd6f44a18e297ab