Edits to sockets and such
Edits to sockets and such