More on Transfer
Many changes regarding sockets