Corrected variables and commentes