full sample variables added plus some varname changes