Add pools to the client and tidy some other stuff up