added new variables, fixed typo