fixed a clienthandle bug, small clenup