- add user relation
- fix bugs