adding client and minor stuff