diff --git a/rtsp.c b/rtsp.c
index 71e78008..bcbb1b50 100644
--- a/rtsp.c
+++ b/rtsp.c
@@ -453,32 +453,33 @@ static void handle_setup(rtsp_conn_info *conn,
     // for everything else, use the general latency setting, if given, or
     // else use the default latency setting
     
+    config.latency=88200;
+    
     if (config.userSuppliedLatency)
       config.latency=config.userSuppliedLatency;
     
     char * ua = msg_get_header(req,"User-Agent");
-//    if (ua==0) {
-//      debug(1,"No User-Agent string found in the SETUP message. Using latency of %d frames.",config.latency);
-//    } else {  
-    if (ua) {  
+    if (ua==0) {
+      debug(1,"No User-Agent string found in the SETUP message. Using latency of %d frames.",config.latency);
+    } else {  
       if (strstr(ua,"iTunes")==ua) {
         int iTunesVersion=0;
         // now check it's version 10 or later
         char *pp = strchr(ua,'/') + 1;
         if (pp)
           iTunesVersion=atoi(pp);
-        // else
-        //  debug(1,"iTunes Version Number not found.");
+        else
+          debug(2,"iTunes Version Number not found.");
         if (iTunesVersion>=10) {        
-          // debug(1,"User-Agent is iTunes 10 or better, (actual version is %d); selecting the iTunes latency of %d frames.",iTunesVersion,config.iTunesLatency);
+          debug(2,"User-Agent is iTunes 10 or better, (actual version is %d); selecting the iTunes latency of %d frames.",iTunesVersion,config.iTunesLatency);
           config.latency=config.iTunesLatency;
         }
       } else if (strstr(ua,"AirPlay")==ua) {
-        // debug(1,"User-Agent is AirPlay; selecting the AirPlay latency of %d frames.",config.AirPlayLatency);
+        debug(2,"User-Agent is AirPlay; selecting the AirPlay latency of %d frames.",config.AirPlayLatency);
         config.latency=config.AirPlayLatency;
-      } // else {
-        // debug(1,"Unrecognised User-Agent. Using latency of %d frames.",config.latency);
-      // }
+      } else {
+        debug(2,"Unrecognised User-Agent. Using latency of %d frames.",config.latency);
+      }
     }
     char *hdr = msg_get_header(req, "Transport");
     if (!hdr)
diff --git a/shairport.c b/shairport.c
index 4d3fbbbc..cff515be 100644
--- a/shairport.c
+++ b/shairport.c
@@ -334,7 +334,7 @@ int main(int argc, char **argv) {
 
     // set defaults
     config.statistics_requested - 0; // don't print stats in the log
-    config.latency = 88200; // AirPlay
+    config.latency = 88200; // AirPlay. Is also reset in rtsp.c when play is about to start
     config.userSuppliedLatency = 0; // zero means none supplied
     config.iTunesLatency = 99400; // this seems to work pretty well for iTunes from Version 10 (?) upwards-- two left-ear headphones, one from the iMac jack, one from an NSLU2 running a cheap "3D Sound" USB Soundcard
     config.AirPlayLatency = 88200; // this seems to work pretty well for AirPlay -- Syncs sound and vision on AppleTV, but also used for iPhone/iPod/iPad sources