Fix client

Fix core of client, the basic connection it's working