fixed some more variables names that were left out of initial diff