added associations, and allow changes to user role