Updates to GUI and sockets stuff