Some client updates. There can be a little memory leak.