update, mainly re: variable names