added limbo sockets
fixed conflicts