update some more typos and add id to user entity