diff --git a/src/main.cxx b/src/main.cxx
index 93f96776..bf314ff7 100644
--- a/src/main.cxx
+++ b/src/main.cxx
@@ -533,7 +533,7 @@ extern FILE *serlog;
 		btn_show_controls->redraw_label();
 	}
 
-	Fl::add_timeout(0, startup);//0.5, startup);
+	Fl::add_timeout(0.1, startup);
 
 	return Fl::run();
 
diff --git a/src/rigs/IC7100.cxx b/src/rigs/IC7100.cxx
index 2fa01711..82d4ed47 100644
--- a/src/rigs/IC7100.cxx
+++ b/src/rigs/IC7100.cxx
@@ -23,12 +23,19 @@
 #include <iostream>
 #include <sstream>
 
+#include "tod_clock.h"
+
 //=============================================================================
 // IC-7100
 /*
 
 */
 
+std::string hexstr(std::string s)
+{
+	return str2hex(s.c_str(), s.length());
+}
+
 const char IC7100name_[] = "IC-7100";
 
 static int nummodes = 14;
@@ -267,26 +274,32 @@ RIG_IC7100::RIG_IC7100() {
 //======================================================================
 // IC7100 unique commands
 //======================================================================
+extern void update_progress(int);
 
 void RIG_IC7100::set_xcvr_auto_on()
 {
-	cmd.clear();
 	int nr = progStatus.comm_baudrate == 6 ? 25 :
 			 progStatus.comm_baudrate == 5 ? 13 :
 			 progStatus.comm_baudrate == 4 ? 7 :
 			 progStatus.comm_baudrate == 3 ? 3 : 2;
-	cmd.append( nr, '\xFE');
+	cmd.assign( nr, '\xFE');
 	cmd.append(pre_to);
 	cmd += '\x18'; cmd += '\x01';
 	cmd.append(post);
 	waitFB("Power ON", 2000);
-	isett("Power ON");
 
-	cmd = pre_to;
+	int msec = 5000;   // wake up time for initialization
+	for (int i = 0; i < msec; i += 100) {
+		MilliSleep(100);
+		update_progress(progress->value() + 2);
+		Fl::awake();
+	}
+
+	cmd.assign(pre_to);
 	cmd += '\x19'; cmd += '\x00';
 	cmd.append(post);
-	waitFOR(8, "get ID", 10000);
-	igett("get ID");
+	std::string again = cmd;
+	waitFOR(8, "get ID", 100);
 }
 
 void RIG_IC7100::set_xcvr_auto_off()
@@ -295,8 +308,10 @@ void RIG_IC7100::set_xcvr_auto_off()
 	cmd.append(pre_to);
 	cmd += '\x18'; cmd += '\x00';
 	cmd.append(post);
+//std::cout << ztime() << " Power OFF " << hexstr(cmd).c_str() << std::endl;
 	waitFB("Power OFF", 200);
-	isett("Power OFF");
+//	isett("Power OFF");
+//std::cout << ztime() << " Power OFF " << hexstr(replystr).c_str() << std::endl;
 }
 
 bool RIG_IC7100::check ()
@@ -320,7 +335,7 @@ void RIG_IC7100::selectA()
 	cmd += '\x07';
 	cmd += '\x00';
 	cmd.append(post);
-	set_trace(2, "selectA()", str2hex(cmd.c_str(), cmd.length()));
+	set_trace(2, "selectA()", hexstr(cmd).c_str());
 	waitFB("select A");
 	igett("select A");
 	IC7100onA = true;
@@ -543,7 +558,7 @@ int RIG_IC7100::get_modeA()
 	if (A.filter > 0 && A.filter < 4)
 		mode_filterA[A.imode] = A.filter;
 
-	get_trace(2, "get_data_modeA()", str2hex(replystr.c_str(), replystr.length()));
+	get_trace(2, "get_data_modeA()", hexstr(replystr).c_str());
 	get_trace(4, "mode_filterA[", IC7100modes_[md], "] = ", szfilter[A.filter-1]);
 
 	if (A.imode == CW7100 || A.imode == CWR7100) {
@@ -644,7 +659,7 @@ int RIG_IC7100::get_modeB()
 	if (B.filter > 0 && B.filter < 4)
 		mode_filterA[B.imode] = B.filter;
 
-	get_trace(2, "get_data_modeB()", str2hex(replystr.c_str(), replystr.length()));
+	get_trace(2, "get_data_modeB()", hexstr(replystr).c_str());
 	get_trace(4, "mode_filterB[", IC7100modes_[md], "] = ", szfilter[A.filter-1]);
 
 	if (B.imode == CW7100 || B.imode == CWR7100) {
@@ -821,7 +836,7 @@ void RIG_IC7100::set_mic_gain(int val)
 	cmd.append("\x14\x0B");
 	cmd.append(bcd255(val));
 	cmd.append( post );
-	set_trace(2, "set_mic_gain()", str2hex(cmd.c_str(), cmd.length()));
+	set_trace(2, "set_mic_gain()", hexstr(cmd).c_str());
 	waitFB("set mic gain");
 }
 
@@ -839,7 +854,7 @@ int RIG_IC7100::get_mic_gain()
 		if (p != string::npos)
 			val = num100(replystr.substr(p+6));
 	}
-	get_trace(2, "get_mic_gain()", str2hex(replystr.c_str(), replystr.length()));
+	get_trace(2, "get_mic_gain()", hexstr(replystr).c_str());
 	return val;
 }
 
@@ -862,7 +877,7 @@ void RIG_IC7100::set_attenuator(int val)
 	cmd += '\x11';
 	cmd += atten_level ? '\x12' : '\x00';
 	cmd.append( post );
-	set_trace(2, "set_attenuator()", str2hex(cmd.c_str(), cmd.length()));
+	set_trace(2, "set_attenuator()", hexstr(cmd).c_str());
 	waitFB("set att");
 }
 
@@ -874,7 +889,7 @@ int RIG_IC7100::get_attenuator()
 	string resp = pre_fm;
 	resp += '\x11';
 	if (waitFOR(7, "get ATT")) {
-		get_trace(2, "get_ATT()", str2hex(replystr.c_str(), replystr.length()));
+		get_trace(2, "get_ATT()", hexstr(replystr).c_str());
 		size_t p = replystr.rfind(resp);
 		if (replystr[p+5] == 0x12) {
 			atten_level = 1;
@@ -946,7 +961,7 @@ void RIG_IC7100::set_preamp(int val)
 	waitFB(	(preamp_level == 0) ? "set Preamp OFF" :
 			(preamp_level == 1) ? "set Preamp Level 1" :
 			"set Preamp Level 2");
-	set_trace(2, "set_preamp()", str2hex(cmd.c_str(), cmd.length()));
+	set_trace(2, "set_preamp()", hexstr(cmd).c_str());
 }
 
 int RIG_IC7100::get_preamp()
@@ -958,7 +973,7 @@ int RIG_IC7100::get_preamp()
 	cmd.append(cstr);
 	cmd.append( post );
 	if (waitFOR(8, "get Preamp Level")) {
-		get_trace(2, "get_preamp()", str2hex(replystr.c_str(), replystr.length()));
+		get_trace(2, "get_preamp()", hexstr(replystr).c_str());
 		size_t p = replystr.rfind(resp);
 		if (p != string::npos)
 			preamp_level = replystr[p+6];
@@ -1078,7 +1093,7 @@ void RIG_IC7100::set_cw_vol()
 	cmd += '\x32';
 	cmd.append(to_bcd((int)(progStatus.cw_vol * 2.55), 3));
 	cmd.append( post );
-	set_trace(2, "set_cw_vol()", str2hex(cmd.c_str(), cmd.length()));
+	set_trace(2, "set_cw_vol()", hexstr(cmd).c_str());
 	waitFB("SET cw sidetone volume");
 }
 
@@ -1088,7 +1103,7 @@ void RIG_IC7100::set_power_control(double val)
 	cmd.append("\x14\x0A");
 	cmd.append(bcd255(val));
 	cmd.append( post );
-	set_trace(2, "set_power_control()", str2hex(cmd.c_str(), cmd.length()));
+	set_trace(2, "set_power_control()", hexstr(cmd).c_str());
 	waitFB("set power");
 }
 
@@ -1105,7 +1120,7 @@ int RIG_IC7100::get_power_control()
 		if (p != string::npos)
 			val = num100(replystr.substr(p+6));
 	}
-	get_trace(2, "get_power_control()", str2hex(replystr.c_str(), replystr.length()));
+	get_trace(2, "get_power_control()", hexstr(replystr).c_str());
 	return val;
 }
 
@@ -1127,7 +1142,7 @@ void RIG_IC7100::set_rf_gain(int val)
 	cmd.append("\x14\x02");
 	cmd.append(bcd255(val));
 	cmd.append( post );
-	set_trace(2, "set_rf_gain()", str2hex(cmd.c_str(), cmd.length()));
+	set_trace(2, "set_rf_gain()", hexstr(cmd).c_str());
 	waitFB("set RF");
 }
 
@@ -1151,7 +1166,7 @@ int RIG_IC7100::get_rf_gain()
 		if (p != string::npos)
 			val = num100(replystr.substr(p + 6));
 	}
-	get_trace(2, "get_rf_gain()", str2hex(replystr.c_str(), replystr.length()));
+	get_trace(2, "get_rf_gain()", hexstr(replystr).c_str());
 	return val;
 }
 
@@ -1167,7 +1182,7 @@ void RIG_IC7100::set_volume_control(int val)
 	cmd.append("\x14\x01");
 	cmd.append(bcd255(val));
 	cmd.append( post );
-	set_trace(2, "set_volume_control()", str2hex(cmd.c_str(), cmd.length()));
+	set_trace(2, "set_volume_control()", hexstr(cmd).c_str());
 	waitFB("set vol");
 }
 
@@ -1185,7 +1200,7 @@ int RIG_IC7100::get_volume_control()
 		if (p != string::npos)
 			val = num100(replystr.substr(p+6));
 	}
-	get_trace(2, "get_volume_control()", str2hex(replystr.c_str(), replystr.length()));
+	get_trace(2, "get_volume_control()", hexstr(replystr).c_str());
 	return val;
 }
 
@@ -1195,7 +1210,7 @@ void RIG_IC7100::set_squelch(int val)
 	cmd.append("\x14\x03");
 	cmd.append(bcd255(val));
 	cmd.append( post );
-	set_trace(2, "set_squelch()", str2hex(cmd.c_str(), cmd.length()));
+	set_trace(2, "set_squelch()", hexstr(cmd).c_str());
 	waitFB("set Sqlch");
 }
 
@@ -1213,7 +1228,7 @@ int  RIG_IC7100::get_squelch()
 		if (p != string::npos)
 			val = num100(replystr.substr(p+6));
 	}
-	get_trace(2, "get_squelch()", str2hex(replystr.c_str(), replystr.length()));
+	get_trace(2, "get_squelch()", hexstr(replystr).c_str());
 	return val;
 }
 
@@ -1253,7 +1268,7 @@ int RIG_IC7100::get_smeter()
 			if (mtr > 100) mtr = 100;
 		}
 	}
-	get_trace(2, "get_smeter()", str2hex(replystr.c_str(), replystr.length()));
+	get_trace(2, "get_smeter()", hexstr(replystr).c_str());
 	return mtr;
 }
 
@@ -1293,7 +1308,7 @@ int RIG_IC7100::get_power_out(void)
 			if (mtr > 100) mtr = 100;
 		}
 	}
-	get_trace(2, "get_power_out()", str2hex(replystr.c_str(), replystr.length()));
+	get_trace(2, "get_power_out()", hexstr(replystr).c_str());
 	return mtr;
 }
 
@@ -1314,7 +1329,7 @@ int RIG_IC7100::get_swr()
 			if (mtr > 100) mtr = 100;
 		}
 	}
-	get_trace(2, "get_swr()", str2hex(replystr.c_str(), replystr.length()));
+	get_trace(2, "get_swr()", hexstr(replystr).c_str());
 	return mtr;
 }
 
@@ -1335,7 +1350,7 @@ int RIG_IC7100::get_alc()
 			if (mtr > 100) mtr = 100;
 		}
 	}
-	get_trace(2, "get_alc()", str2hex(replystr.c_str(), replystr.length()));
+	get_trace(2, "get_alc()", hexstr(replystr).c_str());
 	return mtr;
 }
 
@@ -1373,14 +1388,14 @@ void RIG_IC7100::set_notch(bool on, int freq)
 	cmd += on ? '\x01' : '\x00';
 	cmd.append(post);
 	waitFB("set notch");
-	set_trace(2, "set_notch() ", str2hex(cmd.c_str(), cmd.length()));
+	set_trace(2, "set_notch() ", hexstr(cmd).c_str());
 
 	cmd = pre_to;
 	cmd.append("\x14\x0D");
 	cmd.append(to_bcd(hexval,3));
 	cmd.append(post);
 	waitFB("set notch val");
-	set_trace(2, "set_notch_val() ", str2hex(cmd.c_str(), cmd.length()));
+	set_trace(2, "set_notch_val() ", hexstr(cmd).c_str());
 }
 
 bool RIG_IC7100::get_notch(int &val)
@@ -1395,7 +1410,7 @@ bool RIG_IC7100::get_notch(int &val)
 	cmd.append(cstr);
 	cmd.append( post );
 	if (waitFOR(8, "get notch")) {
-		get_trace(2, "get_notch()", str2hex(replystr.c_str(), replystr.length()));
+		get_trace(2, "get_notch()", hexstr(replystr).c_str());
 		size_t p = replystr.rfind(resp);
 		if (p != string::npos)
 			on = replystr[p + 6];
@@ -1406,7 +1421,7 @@ bool RIG_IC7100::get_notch(int &val)
 		resp.append(cstr);
 		cmd.append(post);
 		if (waitFOR(9, "notch val")) {
-			get_trace(2, "get_notch_val() ", str2hex(replystr.c_str(), replystr.length()));
+			get_trace(2, "get_notch_val() ", hexstr(replystr).c_str());
 			size_t p = replystr.rfind(resp);
 			if (p != string::npos) {
 				val = (int)ceil(fm_bcd(replystr.substr(p+6),3));
@@ -1433,7 +1448,7 @@ bool RIG_IC7100::get_notch(int &val)
 						break;
 				}
 			}
-			get_trace(2, "get_notch_val() ", str2hex(replystr.c_str(), replystr.length()));
+			get_trace(2, "get_notch_val() ", hexstr(replystr).c_str());
 		}
 	}
 	return on;
@@ -1559,7 +1574,7 @@ int RIG_IC7100::get_pbt_inner()
 			val -= 50;
 		}
 	}
-	rig_trace(2, "get_pbt_inner()", str2hex(replystr.c_str(), replystr.length()));
+	rig_trace(2, "get_pbt_inner()", hexstr(replystr).c_str());
 	return val;
 }
 
@@ -1579,7 +1594,7 @@ int RIG_IC7100::get_pbt_outer()
 			val -= 50;
 		}
 	}
-	rig_trace(2, "get_pbt_outer()", str2hex(replystr.c_str(), replystr.length()));
+	rig_trace(2, "get_pbt_outer()", hexstr(replystr).c_str());
 	return val;
 }
 
@@ -1596,7 +1611,7 @@ void RIG_IC7100::set_noise(bool val)
 	cmd.append("\x16\x22");
 	cmd += val ? 1 : 0;
 	cmd.append(post);
-	set_trace(2, "set_noise()", str2hex(cmd.c_str(), cmd.length()));
+	set_trace(2, "set_noise()", hexstr(cmd).c_str());
 	waitFB("set noise");
 }
 
@@ -1610,7 +1625,7 @@ int RIG_IC7100::get_noise()
 	cmd.append(post);
 	if (waitFOR(8, "get noise")) {
 		size_t p = replystr.rfind(resp);
-	get_trace(2, "get_noise()", str2hex(replystr.c_str(), replystr.length()));
+	get_trace(2, "get_noise()", hexstr(replystr).c_str());
 	if (p != string::npos)
 		return (replystr[p+6] ? 1 : 0);
 	}
@@ -1624,7 +1639,7 @@ void RIG_IC7100::set_nb_level(int val)
 	cmd.append("\x14\x12");
 	cmd.append(bcd255(val));
 	cmd.append( post );
-	set_trace(2, "set_nb_level()", str2hex(cmd.c_str(), cmd.length()));
+	set_trace(2, "set_nb_level()", hexstr(cmd).c_str());
 	waitFB("set NB level");
 }
 
@@ -1642,7 +1657,7 @@ int  RIG_IC7100::get_nb_level()
 		if (p != string::npos)
 			val = num100(replystr.substr(p+6));
 	}
-	get_trace(2, "get_nb_level()", str2hex(replystr.c_str(), replystr.length()));
+	get_trace(2, "get_nb_level()", hexstr(replystr).c_str());
 	return val;
 }
 
@@ -1652,7 +1667,7 @@ void RIG_IC7100::set_noise_reduction(int val)
 	cmd.append("\x16\x40");
 	cmd += val ? 1 : 0;
 	cmd.append(post);
-	set_trace(2, "set_noise_reduction()", str2hex(cmd.c_str(), cmd.length()));
+	set_trace(2, "set_noise_reduction()", hexstr(cmd).c_str());
 	waitFB("set NR");
 }
 
@@ -1666,7 +1681,7 @@ int RIG_IC7100::get_noise_reduction()
 	cmd.append(post);
 	if (waitFOR(8, "get NR")) {
 		size_t p = replystr.rfind(resp);
-	get_trace(2, "get_noise_reduction()", str2hex(replystr.c_str(), replystr.length()));
+	get_trace(2, "get_noise_reduction()", hexstr(replystr).c_str());
 	if (p != string::npos)
 		return (replystr[p+6] ? 1 : 0);
 	}
@@ -1681,7 +1696,7 @@ void RIG_IC7100::set_noise_reduction_val(int val)
 	val += 8;
 	cmd.append(to_bcd(val, 3));
 	cmd.append(post);
-	set_trace(2, "set_noise_reduction_val()", str2hex(cmd.c_str(), cmd.length()));
+	set_trace(2, "set_noise_reduction_val()", hexstr(cmd).c_str());
 	waitFB("set NRval");
 }
 
@@ -1702,7 +1717,7 @@ int RIG_IC7100::get_noise_reduction_val()
 			val /= 16;
 		}
 	}
-	get_trace(2, "get_nr_val()", str2hex(replystr.c_str(), replystr.length()));
+	get_trace(2, "get_nr_val()", hexstr(replystr).c_str());
 	return val;
 }
 
@@ -1735,7 +1750,7 @@ void RIG_IC7100::get_band_selection(int v)
 	cmd.append( post );
 
 	if (waitFOR(56, "get band stack")) {
-		set_trace(2, "get band stack", str2hex(replystr.c_str(), replystr.length()));
+		set_trace(2, "get band stack", hexstr(replystr).c_str());
 		size_t p = replystr.rfind(pre_fm);
 		if (p != string::npos) {
 			unsigned long int bandfreq = fm_bcd_be(replystr.substr(p + 8, 5), 10);
@@ -1773,7 +1788,7 @@ void RIG_IC7100::get_band_selection(int v)
 			}
 		}
 	} else
-		set_trace(2, "get band stack", str2hex(replystr.c_str(), replystr.length()));
+		set_trace(2, "get band stack", hexstr(replystr).c_str());
 }
 
 void RIG_IC7100::set_band_selection(int v)
@@ -1804,7 +1819,7 @@ void RIG_IC7100::set_band_selection(int v)
     cmd.append("                ");                    // byte 39 memory name, 16 chars
 	cmd.append(post);
 	waitFB("set_band_selection");
-	set_trace(2, "set_band_selection()", str2hex(replystr.c_str(), replystr.length()));
+	set_trace(2, "set_band_selection()", hexstr(replystr).c_str());
 }
 
 void RIG_IC7100::setVfoAdj(double v)
@@ -1817,7 +1832,7 @@ void RIG_IC7100::setVfoAdj(double v)
 	cmd.append(bcd255(int(v)));
 	cmd.append(post);
 	waitFB("SET vfo adjust");
-	set_trace(2, "set_vfo_adj()", str2hex(cmd.c_str(), cmd.length()));
+	set_trace(2, "set_vfo_adj()", hexstr(cmd).c_str());
 }
 
 double RIG_IC7100::getVfoAdj()
@@ -1834,7 +1849,7 @@ double RIG_IC7100::getVfoAdj()
 			vfo_ = num100(replystr.substr(p+8));
 		}
 	}
-	get_trace(2, "get_vfo_adj()", str2hex(replystr.c_str(), replystr.length()));
+	get_trace(2, "get_vfo_adj()", hexstr(replystr).c_str());
 	return vfo_;
 }
 
@@ -1860,7 +1875,7 @@ void RIG_IC7100::set_FILT(int filter)
 			cmd += filter;
 		cmd.append( post );
 		waitFB("set mode/filter B");
-		set_trace(2, "set mode/filter B", str2hex(replystr.c_str(), replystr.length()));
+		set_trace(2, "set mode/filter B", hexstr(replystr).c_str());
 
 		if (B.imode >= LSBD7100) {
 			cmd = pre_to;
@@ -1869,7 +1884,7 @@ void RIG_IC7100::set_FILT(int filter)
 			cmd += filter;
 			cmd.append( post);
 			waitFB("set data mode B");
-			set_trace(2, "set data mode B", str2hex(replystr.c_str(), replystr.length()));
+			set_trace(2, "set data mode B", hexstr(replystr).c_str());
 		}
 	} else {
 		A.filter = filter;
@@ -1882,7 +1897,7 @@ void RIG_IC7100::set_FILT(int filter)
 			cmd += filter;
 		cmd.append( post );
 		waitFB("set filter A ");
-		set_trace(2, "set filter A", str2hex(replystr.c_str(), replystr.length()));
+		set_trace(2, "set filter A", hexstr(replystr).c_str());
 
 		if (A.imode >= LSBD7100) {
 			cmd = pre_to;
@@ -1891,7 +1906,7 @@ void RIG_IC7100::set_FILT(int filter)
 			cmd += filter;
 			cmd.append( post);
 			waitFB("set data mode A");
-			set_trace(2, "set data mode A", str2hex(replystr.c_str(), replystr.length()));
+			set_trace(2, "set data mode A", hexstr(replystr).c_str());
 		}
 	}
 }
diff --git a/src/server/xml_server.cxx b/src/server/xml_server.cxx
index 25290f7b..e8f50ed5 100644
--- a/src/server/xml_server.cxx
+++ b/src/server/xml_server.cxx
@@ -1851,14 +1851,12 @@ public:
 			return;
 		}
 		std::string command = std::string(params[0]);
-		bool usehex = false;
 		if (command.empty()) return;
 
 		std::string cmd = "";
 		if (command.find("x") != string::npos) { // hex strings
 			size_t p = 0;
 			unsigned int val;
-			usehex = true;
 			while (( p = command.find("x", p)) != string::npos) {
 				sscanf(&command[p+1], "%x", &val);
 				cmd += (unsigned char) val;
@@ -2109,10 +2107,14 @@ std::string print_xmlhelp()
 {
 	string pstr;
 	string line;
+	size_t maxlen = 0;
+	for (size_t n = 0; n < sizeof(mlist) / sizeof(*mlist); n++)
+		if (mlist[n].name.length() > maxlen) maxlen = mlist[n].name.length();
+
 	for (size_t n = 0; n < sizeof(mlist) / sizeof(*mlist); ++n) {
 		line.clear();
 		line.assign(mlist[n].name);
-		line.append(20 - line.length(), ' ');
+		line.append(maxlen + 4 - line.length(), ' ');
 		line.append(mlist[n].signature);
 		line.append("  ");
 		line.append(mlist[n].help);
diff --git a/src/support/serial.cxx b/src/support/serial.cxx
index 9e370988..939bbb20 100644
--- a/src/support/serial.cxx
+++ b/src/support/serial.cxx
@@ -314,9 +314,9 @@ int  Cserial::ReadBuffer (char *buf, int nchars)
 		}
 		retnum = read (fd, (char *)(buf + nread), nchars);
 		if (retnum < 0)
-			return 0;//nread;
+			return 0;
 		if (retnum == 0)
-			return nread;
+			break;
 		nread += retnum;
 		nchars -= retnum;
 	}
diff --git a/src/support/support.cxx b/src/support/support.cxx
index 977b8a12..ce272146 100644
--- a/src/support/support.cxx
+++ b/src/support/support.cxx
@@ -52,6 +52,7 @@
 #include "tod_clock.h"
 #include "trace.h"
 #include "cwio.h"
+#include "xml_server.h"
 
 void initTabs();
 
@@ -1458,15 +1459,16 @@ void set_ptt(void *d)
 	}
 }
 
-bool close_rig = false;
-
 void * serial_thread_loop(void *d)
 {
   static int  loopcount = progStatus.serloop_timing / 10;
   static int  poll_nbr = 0;
 
 	for(;;) {
-		if (!run_serial_thread) break;
+
+		if (!run_serial_thread) {
+			break;
+		}
 
 		MilliSleep(10);
 
@@ -1474,11 +1476,6 @@ void * serial_thread_loop(void *d)
 			goto serial_bypass_loop;
 		}
 
-		if (close_rig) {
-			trace(1, "serial_thread_loop: close_rig");
-			return NULL;
-		}
-
 //send any freq/mode/bw changes in the queu
 		if (!srvc_reqs.empty())
 			serviceQUE();
@@ -3365,11 +3362,13 @@ void close_UI()
 		trace(1, "close_UI()");
 		run_serial_thread = false;
 	}
+//std::cout << "close_UI()" << std::endl;
+//std::cout << "pthread_join(*serial_thread, NULL)" << std::endl;
 	pthread_join(*serial_thread, NULL);
 
 // xcvr auto off
-//	if (selrig->has_xcvr_auto_on_off && progStatus.xcvr_auto_off)
-//		selrig->set_xcvr_auto_off();
+	if (selrig->has_xcvr_auto_on_off && progStatus.xcvr_auto_off)
+		selrig->set_xcvr_auto_off();
 
 	// close down the serial port
 	RigSerial->ClosePort();
@@ -3392,11 +3391,7 @@ void closeRig()
 	if (xcvr_initialized) {
 		restore_rig_vals();
 		selrig->shutdown();
-	// xcvr auto off
-		if (selrig->has_xcvr_auto_on_off && progStatus.xcvr_auto_off)
-			selrig->set_xcvr_auto_off();
 	}
-	close_rig = false;
 }
 
 void cbExit()
@@ -3459,14 +3454,10 @@ void cbExit()
 	progStatus.saveLastState();
 	closeRig();
 
-	{
-		guard_lock serial_lock(&mutex_serial);
-		trace(1, "shutdown serial thread");
-		close_rig = true;
-	}
-
 	stop_cwio_thread();
 
+	exit_server();
+
 	close_UI();
 
 	if (tracewindow) tracewindow->hide();
@@ -5739,9 +5730,15 @@ void initRig()
 	xcvr_initialized = false;
 	if (tabs_dialog && tabs_dialog->visible()) tabs_dialog->hide();
 
-	grpInitializing->show();
 	main_group->hide();
+
+	grpInitializing->size(mainwindow->w(), mainwindow->h() - grpInitializing->y());
+	grpInitializing->show();
+	grpInitializing->redraw();
+	mainwindow->damage();
 	mainwindow->redraw();
+	update_progress(0);
+	Fl::check();
 
 	flrig_abort = false;
 
@@ -5767,8 +5764,15 @@ void initRig()
 		trace(1, "init_rig()");
 
 		// Xcvr Auto Power on as soon as possible
-		if (selrig->has_xcvr_auto_on_off && progStatus.xcvr_auto_on)
+		if (selrig->has_xcvr_auto_on_off && progStatus.xcvr_auto_on) {
+			progress->label("Auto Start");
+			progress->redraw_label();
+			update_progress(0);
 			selrig->set_xcvr_auto_on();
+			progress->label("Initializing");
+			progress->redraw_label();
+			update_progress(0);
+		}
 
 		bool check_ok = false;
 		if (progStatus.xcvr_serial_port != "NONE") check_ok = selrig->check();
diff --git a/src/support/trace.cxx b/src/support/trace.cxx
index a9c255c0..041a0aaf 100644
--- a/src/support/trace.cxx
+++ b/src/support/trace.cxx
@@ -81,26 +81,24 @@ static void make_trace_window() {
 
 static void update_tracetext(void *)
 {
-	if (!tracewindow->visible()) {
-		tracestrings.clear();
-		return;
-	}
 	guard_lock tt(&mutex_trace);
-	if (tracedisplay->buffer()->length() > 100000)
-		tracedisplay->buffer()->text("");
-	for (size_t n = 0; n < tracestrings.size(); n++)
-		tracedisplay->insert(tracestrings[n].c_str());
-	tracestrings.clear();
-}
 
-static void tracefile(std::string s)
-{
 	string trace_fname = RigHomeDir;
 	trace_fname.append("trace.txt");
 	ofstream tfile(trace_fname.c_str(), ios::app);
-	if (tfile)
-		tfile << s;
+	if (tfile)  {
+		for (size_t n = 0; n < tracestrings.size(); n++)
+			tfile << tracestrings[n];
+	}
 	tfile.close();
+
+	if (tracewindow->visible()) {
+		if (tracedisplay->buffer()->length() > 100000)
+			tracedisplay->buffer()->text("");
+		for (size_t n = 0; n < tracestrings.size(); n++)
+			tracedisplay->insert(tracestrings[n].c_str());
+	}
+    tracestrings.clear();
 }
 
 void trace(int n, ...) // all args of type const char *
@@ -118,11 +116,10 @@ void trace(int n, ...) // all args of type const char *
 		s << " " << va_arg(vl, const char *);
 	va_end(vl);
 	s << "\n";
-	tracefile(s.str());
 
 	guard_lock tt(&mutex_trace);
-	tracestrings.push_back(s.str());
-	Fl::awake(update_tracetext);
+		tracestrings.push_back(s.str());
+		Fl::awake(update_tracetext);
 }
 
 void xml_trace(int n, ...) // all args of type const char *
@@ -140,11 +137,10 @@ void xml_trace(int n, ...) // all args of type const char *
 		s << " " << va_arg(vl, const char *);
 	va_end(vl);
 	s << "\n";
-	tracefile(s.str());
 
 	guard_lock tt(&mutex_trace);
-	tracestrings.push_back(s.str());
-	Fl::awake(update_tracetext);
+		tracestrings.push_back(s.str());
+		Fl::awake(update_tracetext);
 }
 
 void rig_trace(int n, ...) // all args of type const char *
@@ -162,11 +158,10 @@ void rig_trace(int n, ...) // all args of type const char *
 		s << " " << va_arg(vl, const char *);
 	va_end(vl);
 	s << "\n";
-	tracefile(s.str());
 
 	guard_lock tt(&mutex_trace);
-	tracestrings.push_back(s.str());
-	Fl::awake(update_tracetext);
+		tracestrings.push_back(s.str());
+		Fl::awake(update_tracetext);
 }
 
 void set_trace(int n, ...) // all args of type const char *
@@ -184,11 +179,10 @@ void set_trace(int n, ...) // all args of type const char *
 		s << " " << va_arg(vl, const char *);
 	va_end(vl);
 	s << "\n";
-	tracefile(s.str());
 
 	guard_lock tt(&mutex_trace);
-	tracestrings.push_back(s.str());
-	Fl::awake(update_tracetext);
+		tracestrings.push_back(s.str());
+		Fl::awake(update_tracetext);
 }
 
 void get_trace(int n, ...) // all args of type const char *
@@ -206,11 +200,10 @@ void get_trace(int n, ...) // all args of type const char *
 		s << " " << va_arg(vl, const char *);
 	va_end(vl);
 	s << "\n";
-	tracefile(s.str());
 
 	guard_lock tt(&mutex_trace);
-	tracestrings.push_back(s.str());
-	Fl::awake(update_tracetext);
+		tracestrings.push_back(s.str());
+		Fl::awake(update_tracetext);
 }
 
 void rpc_trace(int n, ...) // all args of type const char *
@@ -269,10 +262,8 @@ void rpc_trace(int n, ...) // all args of type const char *
 
 	if (str[str.length()-1] != '\n') str += '\n';
 
-	tracefile(str);
-
 	guard_lock tt(&mutex_trace);
-	tracestrings.push_back(str);
-	Fl::awake(update_tracetext);
+		tracestrings.push_back(str);
+		Fl::awake(update_tracetext);
 }