fixed some variables and comments