Additional changes to codebook and list of variables.