Reworked how the sockets are connected to the sockets
Minor changes