added friends + location to user models