diff --git a/MeteorLight.go b/MeteorLight.go
index edf91ec..9ea39bc 100644
--- a/MeteorLight.go
+++ b/MeteorLight.go
@@ -34,7 +34,7 @@ func main() {
 		server.SetKeepAlivesEnabled(false)
 
 		//setup a timeout to prevent slow clients blocking. See https://github.com/golang/go/issues/16100
-		timeoutListener, err := newListener("tcp", server.Addr, time.Second*15, time.Second*30)
+		timeoutListener, err := newListener("tcp", server.Addr, time.Second*15, time.Second*15)
 		if err != nil {
 			log.Panic(err)
 		}
diff --git a/listener.go b/listener.go
index baf545a..ec11e21 100644
--- a/listener.go
+++ b/listener.go
@@ -1,6 +1,7 @@
 package main
 
 import (
+	"log"
 	"net"
 	"sync/atomic"
 	"time"
@@ -17,6 +18,17 @@ func (l *listener) Accept() (net.Conn, error) {
 	if err != nil {
 		return nil, err
 	}
+
+	if tcpConnection, ok := c.(*net.TCPConn); ok {
+		tcpConnection.SetReadBuffer(1024 * 64)
+		tcpConnection.SetWriteBuffer(1024 * 64)
+		tcpConnection.SetKeepAlive(true)
+		tcpConnection.SetKeepAlivePeriod(l.WriteTimeout / 4)
+		tcpConnection.SetNoDelay(true)
+		tcpConnection.SetLinger(0)
+	}
+
+	log.Printf("accepted new connection from %s\n", c.RemoteAddr().String())
 	tc := &Conn{
 		Conn:                     c,
 		ReadTimeout:              l.ReadTimeout,
diff --git a/queue.go b/queue.go
index 8fddecd..5e0be76 100644
--- a/queue.go
+++ b/queue.go
@@ -508,7 +508,7 @@ func (q *Queue) HandleRadioRequest(writer http.ResponseWriter, request *http.Req
 						}
 					}
 
-					if len(writeChannel) >= byteSliceChannelBuffer-1 {
+					if len(writeChannel) >= (byteSliceChannelBuffer - 1) {
 						requestDone = errors.New("client ran out of buffer")
 						return requestDone
 					}
@@ -524,8 +524,9 @@ func (q *Queue) HandleRadioRequest(writer http.ResponseWriter, request *http.Req
 						return nil
 					}
 
-					if len(writeChannel) >= byteSliceChannelBuffer-1 {
+					if len(writeChannel) >= (byteSliceChannelBuffer - 1) {
 						requestDone = errors.New("client ran out of buffer")
+						log.Printf("failed to write data to client: %s\n", requestDone)
 						return requestDone
 					}
 					writeChannel <- packet.GetData()
@@ -543,6 +544,7 @@ func (q *Queue) HandleRadioRequest(writer http.ResponseWriter, request *http.Req
 
 				for byteSlice := range writeChannel {
 					if _, requestDone = writer.Write(byteSlice); requestDone != nil {
+						log.Printf("failed to write data to client: %s\n", requestDone)
 						break
 					}
 					//try flush
@@ -607,6 +609,7 @@ func (q *Queue) HandleRadioRequest(writer http.ResponseWriter, request *http.Req
 					Headers: headers,
 				},
 				Start: func(packets []packetizer.Packet) error {
+					log.Printf("adding %s client to stream %s\n", request.RemoteAddr, mount.Mount)
 					if len(packets) > 0 {
 						sampleBufferMin := packets[len(packets)-1].GetStartSampleNumber() - sampleBufferLimit
 						for _, p := range packets {
@@ -621,6 +624,7 @@ func (q *Queue) HandleRadioRequest(writer http.ResponseWriter, request *http.Req
 				},
 				Write: packetWriteCallback,
 				Close: func() {
+					log.Printf("removing %s client from stream %s\n", request.RemoteAddr, mount.Mount)
 					defer wgClient.Done()
 					close(writeChannel)
 				},