comments and improvements for client set