changes for socket support (wip)
additional debugging, and clone mapping POC