Uncommented code to add user to org, other minor fixes
Fixed conflicts