fixed Client

the Client should work now! But it is far from finished