fixed some variables