Fixes after code review and added IP address to user-subdocument