client : some bugs fixed