Added client limits and tests, some CLient interface changes