Add extra variables, fix bug on variable name in regression.