updated a few more variable names