TCPClient & few fixes