more work on wave 3 data

bring in a few more variables, more work getting wave 3 data into
dataset