minor changes in client