Fixed multiple ID issues - all ref are now to the user _id
Merge