Revert "Revert "Tolerance and Commenting""

This reverts commit f2c4bd3e7ab0d5fb1dad1406a22e90980f9d6f1e.