Revert "Revert "Revert "Correction and comments"""

This reverts commit 43c7bcf8b450c9826398ab3e5d873fce3ea8e420.
Revert "Revert "Correction and comments""

This reverts commit 45f9f34380d22a7c741d86eafabc1ded9bfdbc01.