Additional variable recodings

Incomplete version 1, with additional variable recoding