save away clientId for subscription and add more logging