Add comment -> Critical Overflow, to easy the location of the overflow that...

Add comment -> Critical Overflow, to easy the location of the overflow that really need to be taken care of, plus some cleaning