added TCPKeepAlive and minor fixes/updates