diff --git a/modem/arq_session.py b/modem/arq_session.py
index c72873b9..d89b639c 100644
--- a/modem/arq_session.py
+++ b/modem/arq_session.py
@@ -32,7 +32,7 @@ class ARQSession:
         },
         3: {
             'mode': codec2.FREEDV_MODE.data_ofdm_2438,
-            'min_snr': 7,
+            'min_snr': 8,
             'duration_per_frame': 6.5,
             'bandwidth': 2438,
         },
diff --git a/modem/codec2.py b/modem/codec2.py
index c2945fc6..b6fe0981 100644
--- a/modem/codec2.py
+++ b/modem/codec2.py
@@ -586,7 +586,7 @@ data_ofdm_500_config.config.contents.tx_uw = create_tx_uw(16, [1, 1, 0, 0, 1, 0,
 data_ofdm_2438_config = create_default_ofdm_config()
 data_ofdm_2438_config.config.contents.ns = 5
 data_ofdm_2438_config.config.contents.np = 52
-data_ofdm_2438_config.config.contents.tcp = 0.006
+data_ofdm_2438_config.config.contents.tcp = 0.004
 data_ofdm_2438_config.config.contents.ts = 0.016
 data_ofdm_2438_config.config.contents.rs = 1.0 / data_ofdm_2438_config.config.contents.ts
 data_ofdm_2438_config.config.contents.nc = 39
diff --git a/modem/command_cq.py b/modem/command_cq.py
index bd71c7e3..f5accafa 100644
--- a/modem/command_cq.py
+++ b/modem/command_cq.py
@@ -6,8 +6,4 @@ class CQCommand(TxCommand):
         return self.frame_factory.build_cq()
 
     def get_tx_mode(self):
-        #return FREEDV_MODE.data_ofdm_500
-        #return FREEDV_MODE.datac3
         return FREEDV_MODE.data_ofdm_2438
-        #return FREEDV_MODE.data_qam_2438
-        #return FREEDV_MODE.qam16c2
\ No newline at end of file
diff --git a/modem/server.py b/modem/server.py
index b03a4f5d..9d350106 100644
--- a/modem/server.py
+++ b/modem/server.py
@@ -326,6 +326,7 @@ def sock_states(sock):
 
 @atexit.register
 def stop_server():
+    print("------------------------------------------")
     try:
         app.service_manager.modem_service.put("stop")
         if app.socket_interface_manager:
@@ -335,10 +336,11 @@ def stop_server():
             app.service_manager.modem.sd_input_stream.stop
         audio.sd._terminate()
     except Exception as e:
+        print(e)
         print("Error stopping modem")
     time.sleep(1)
-    print("------------------------------------------")
     print('Server shutdown...')
+    print("------------------------------------------")
 
 if __name__ == "__main__":
     app.config['SOCK_SERVER_OPTIONS'] = {'ping_interval': 10}