diff --git a/client/stream.cpp b/client/stream.cpp
index c3e1fbfd..09079c44 100644
--- a/client/stream.cpp
+++ b/client/stream.cpp
@@ -306,7 +306,7 @@ bool Stream::getPlayerChunk(void* outputBuffer, const cs::usec& outputBufferDacT
 		{
 			if (buffer_.full())
 			{
-				if (cs::usec(abs(median_)) > cs::msec(2))
+				if (cs::usec(abs(median_)) > cs::msec(1))
 				{
 					logO << "pBuffer->full() && (abs(median_) > 1): " << median_ << "\n";
 					sleep_ = cs::usec(median_);
@@ -322,7 +322,7 @@ bool Stream::getPlayerChunk(void* outputBuffer, const cs::usec& outputBufferDacT
 */			}
 			else if (shortBuffer_.full())
 			{
-				if (cs::usec(abs(shortMedian_)) > cs::msec(20))
+				if (cs::usec(abs(shortMedian_)) > cs::msec(5))
 				{
 					logO << "pShortBuffer->full() && (abs(shortMedian_) > 5): " << shortMedian_ << "\n";
 					sleep_ = cs::usec(shortMedian_);
@@ -332,7 +332,7 @@ bool Stream::getPlayerChunk(void* outputBuffer, const cs::usec& outputBufferDacT
 					setRealSampleRate(format_.rate + -shortMedian_ / 100);
 				}
 */			}
-			else if (miniBuffer_.full() && (cs::usec(abs(miniBuffer_.median())) > cs::msec(200)))
+			else if (miniBuffer_.full() && (cs::usec(abs(miniBuffer_.median())) > cs::msec(50)))
 			{
 				logO << "pMiniBuffer->full() && (abs(pMiniBuffer->mean()) > 50): " << miniBuffer_.median() << "\n";
 				sleep_ = cs::usec((cs::msec::rep)miniBuffer_.mean());
diff --git a/server/snapserver.1 b/server/snapserver.1
index 2271f3b8..65fda7ce 100644
--- a/server/snapserver.1
+++ b/server/snapserver.1
@@ -25,7 +25,7 @@ show version number
 server port
 .TP
 \fB-s, --sampleformat\fR
-sample format (default = 44100:16:2)
+sample format (default = 48000:16:2)
 .TP
 \fB-c, --codec\fR
 transport codec [flac|ogg|pcm][:options]. Type codec:? to get codec specific options
diff --git a/server/streamServer.cpp b/server/streamServer.cpp
index 6d32d01b..539be402 100644
--- a/server/streamServer.cpp
+++ b/server/streamServer.cpp
@@ -215,12 +215,12 @@ void StreamServer::onMessageReceived(ControlSession* controlSession, const std::
 
 void StreamServer::onMessageReceived(StreamSession* connection, const msg::BaseMessage& baseMessage, char* buffer)
 {
-	logO << "getNextMessage: " << baseMessage.type << ", size: " << baseMessage.size << ", id: " << baseMessage.id << ", refers: " << baseMessage.refersTo << ", sent: " << baseMessage.sent.sec << "," << baseMessage.sent.usec << ", recv: " << baseMessage.received.sec << "," << baseMessage.received.usec << "\n";
+	logD << "getNextMessage: " << baseMessage.type << ", size: " << baseMessage.size << ", id: " << baseMessage.id << ", refers: " << baseMessage.refersTo << ", sent: " << baseMessage.sent.sec << "," << baseMessage.sent.usec << ", recv: " << baseMessage.received.sec << "," << baseMessage.received.usec << "\n";
 	if (baseMessage.type == message_type::kRequest)
 	{
 		msg::Request requestMsg;
 		requestMsg.deserialize(baseMessage, buffer);
-		logO << "request: " << requestMsg.request << "\n";
+		logD << "request: " << requestMsg.request << "\n";
 		if (requestMsg.request == kTime)
 		{
 			msg::Time timeMsg;
@@ -231,7 +231,7 @@ void StreamServer::onMessageReceived(StreamSession* connection, const msg::BaseM
 		}
 		else if (requestMsg.request == kServerSettings)
 		{
-			logO << "request kServerSettings: " << connection->macAddress << "\n";
+			logD << "request kServerSettings: " << connection->macAddress << "\n";
 			std::unique_lock<std::mutex> mlock(mutex_);
 			ClientInfoPtr clientInfo = Config::instance().getClientInfo(connection->macAddress, true);
 			if (clientInfo == nullptr)
@@ -240,16 +240,14 @@ void StreamServer::onMessageReceived(StreamSession* connection, const msg::BaseM
 			}
 			else
 			{
-				logO << "request kServerSettings\n";
+				logD << "request kServerSettings\n";
 				msg::ServerSettings serverSettings;
 				serverSettings.volume = clientInfo->volume.percent;
 				serverSettings.muted = clientInfo->volume.muted;
 				serverSettings.latency = clientInfo->latency;
 				serverSettings.refersTo = requestMsg.id;
 				serverSettings.bufferMs = settings_.bufferMs;
-				logO << "request kServerSettings\n";
 				connection->send(&serverSettings);
-				logO << "request kServerSettings\n";
 			}
 		}
 		else if (requestMsg.request == kSampleFormat)
diff --git a/server/streamServer.h b/server/streamServer.h
index ca89ad52..52bfa7f2 100644
--- a/server/streamServer.h
+++ b/server/streamServer.h
@@ -49,7 +49,7 @@ struct StreamServerSettings
 		fifoName("/tmp/snapfifo"),
 		codec("flac"),
 		bufferMs(1000),
-		sampleFormat("44100:16:2"),
+		sampleFormat("48000:16:2"),
 		pipeReadMs(20)
 	{
 	}