[master] more stuff
[master] fixed some issues in TCPConnectionHandler.