added a few new variables and renamed some of the old ones