Revert "Revert "Correction and comments""

This reverts commit 45f9f34380d22a7c741d86eafabc1ded9bfdbc01.