corrected some variable names