Working with split sockets. Has Errors.
Updated the socket API.
Updating from master.
Code clean-up.