updates for Sockets

See comments in Thread Handlers