changes to socket server and twitter handling