Clever mapping for updating data variables.
Housecleaning and a new mapping or two.