sockets client and heroku fix (possible)
merge