Looking at recode issues
Addressing #23 and tidying recoding
Merge branch 'dev' into ms