New variables and minor changes