update variables and comments