tracking down this bug
Heavy cleanup
Feeling better about the sockets
Cleanup
add some missing callbacks