fixed some variable names