add client and fixes