Update variables and comments