Added some comments to Clients
Merge fix