Updated User to be able to handle friends

Also fixed update user