small changes to CAH_Client