minor changes of client