the current changes

I changed some of the variable names and add all the changes you
mentioned