client socket updates

![200234](https://cloud.githubusercontent.com/assets/149630/4330948/a53a118e-3fba-11e4-97d3-1f184d253609.gif)