Improved some comments
Corrected a not intended change of a string