diff --git a/src/syncterm/bbslist.c b/src/syncterm/bbslist.c
index ddd091fcf6e0bcd9620033ad47d029bb03b2e319..5cff5c28a38cc90127a636a7bae0e7cebdbc5525 100644
--- a/src/syncterm/bbslist.c
+++ b/src/syncterm/bbslist.c
@@ -814,50 +814,94 @@ int edit_list(struct bbslist **list, struct bbslist *item,char *listpath,int isd
 		opt[i][0]=0;
 		uifc.changes=0;
 
-		uifc.helpbuf=	"`Edit Directory Entry`\n\n"
-						"Select item to edit.\n\n"
-						"~ Name ~\n"
-						"        The name of the BBS entry\n\n"
-						"~ Phone Number / Device Name / Command / Address ~\n"
-						"        Required information to establish the connection (type specific)\n\n"
-						"~ Conection Type ~\n"
-						"        Type of connection\n\n"
-						"~ TCP Port ~ (if applicable)\n"
-						"        TCP port to connect to (applicable types only)\n\n"
-						"~ Username ~\n"
-						"        Username sent by the auto-login command\n\n"
-						"~ Password ~\n"
-						"        Password sent by auto-login command (not securely stored)\n\n"
-						"~ System Password ~\n"
-						"        System Password sent by auto-login command (not securely stored)\n\n"
-						"~ Screen Mode ~\n"
-						"        Display mode to use\n\n"
-						"~ Hide Status Line ~\n"
-						"        Selects if the status line should be hidden, giving an extra\n"
-						"        display row\n\n"
-						"~ Download Path ~\n"
-						"        Default path to store downloaded files\n\n"
-						"~ Upload Path ~\n"
-						"        Default path for uploads\n\n"
-						"~ Log File ~\n"
-						"        Log file name when logging is enabled\n\n"
-						"~ Log Transfers ~\n"
-						"        Cycles through the various transfer log settings.\n\n"
-						"~ Log Telnet Cmds ~\n"
-						"        Cycles through the various telnet command log settings.\n\n"
-						"~ Append Log File ~\n"
-						"        Append log file (instead of overwrite) on each connection\n\n"
-						"~ Comm Rate ~\n"
-						"        Display speed\n\n"
-						"~ ANSI Music ~\n"
-						"        ANSI music type selection\n\n"
-						"~ Address Family ~\n"
-						"        IPv4 or IPv6\n\n"
-						"~ Font ~\n"
-						"        Select font to use for the entry\n\n"
-						"~ Hide Popups ~\n"
-						"        Hide all popup dialogs (i.e., Connecting, Disconnected, etc.)\n\n"
-						;
+		if (isdefault) {
+			uifc.helpbuf=	"`Edit Default Connection`\n\n"
+							"Select item to edit.\n\n"
+							"~ Conection Type ~\n"
+							"        Type of connection\n\n"
+							"~ TCP Port ~ (if applicable)\n"
+							"        TCP port to connect to (applicable types only)\n\n"
+							"~ Username ~\n"
+							"        Username sent by the auto-login command\n\n"
+							"~ Password ~\n"
+							"        Password sent by auto-login command (not securely stored)\n\n"
+							"~ System Password ~\n"
+							"        System Password sent by auto-login command (not securely stored)\n\n"
+							"~ Screen Mode ~\n"
+							"        Display mode to use\n\n"
+							"~ Hide Status Line ~\n"
+							"        Selects if the status line should be hidden, giving an extra\n"
+							"        display row\n\n"
+							"~ Download Path ~\n"
+							"        Default path to store downloaded files\n\n"
+							"~ Upload Path ~\n"
+							"        Default path for uploads\n\n"
+							"~ Log File ~\n"
+							"        Log file name when logging is enabled\n\n"
+							"~ Log Transfers ~\n"
+							"        Cycles through the various transfer log settings.\n\n"
+							"~ Log Telnet Cmds ~\n"
+							"        Cycles through the various telnet command log settings.\n\n"
+							"~ Append Log File ~\n"
+							"        Append log file (instead of overwrite) on each connection\n\n"
+							"~ Comm Rate ~\n"
+							"        Display speed\n\n"
+							"~ ANSI Music ~\n"
+							"        ANSI music type selection\n\n"
+							"~ Address Family ~\n"
+							"        IPv4 or IPv6\n\n"
+							"~ Font ~\n"
+							"        Select font to use for the entry\n\n"
+							"~ Hide Popups ~\n"
+							"        Hide all popup dialogs (i.e., Connecting, Disconnected, etc.)\n\n"
+							;
+		}
+		else {
+			uifc.helpbuf=	"`Edit Directory Entry`\n\n"
+							"Select item to edit.\n\n"
+							"~ Name ~\n"
+							"        The name of the BBS entry\n\n"
+							"~ Phone Number / Device Name / Command / Address ~\n"
+							"        Required information to establish the connection (type specific)\n\n"
+							"~ Conection Type ~\n"
+							"        Type of connection\n\n"
+							"~ TCP Port ~ (if applicable)\n"
+							"        TCP port to connect to (applicable types only)\n\n"
+							"~ Username ~\n"
+							"        Username sent by the auto-login command\n\n"
+							"~ Password ~\n"
+							"        Password sent by auto-login command (not securely stored)\n\n"
+							"~ System Password ~\n"
+							"        System Password sent by auto-login command (not securely stored)\n\n"
+							"~ Screen Mode ~\n"
+							"        Display mode to use\n\n"
+							"~ Hide Status Line ~\n"
+							"        Selects if the status line should be hidden, giving an extra\n"
+							"        display row\n\n"
+							"~ Download Path ~\n"
+							"        Default path to store downloaded files\n\n"
+							"~ Upload Path ~\n"
+							"        Default path for uploads\n\n"
+							"~ Log File ~\n"
+							"        Log file name when logging is enabled\n\n"
+							"~ Log Transfers ~\n"
+							"        Cycles through the various transfer log settings.\n\n"
+							"~ Log Telnet Cmds ~\n"
+							"        Cycles through the various telnet command log settings.\n\n"
+							"~ Append Log File ~\n"
+							"        Append log file (instead of overwrite) on each connection\n\n"
+							"~ Comm Rate ~\n"
+							"        Display speed\n\n"
+							"~ ANSI Music ~\n"
+							"        ANSI music type selection\n\n"
+							"~ Address Family ~\n"
+							"        IPv4 or IPv6\n\n"
+							"~ Font ~\n"
+							"        Select font to use for the entry\n\n"
+							"~ Hide Popups ~\n"
+							"        Hide all popup dialogs (i.e., Connecting, Disconnected, etc.)\n\n"
+							;
+		}
 		i=uifc.list(WIN_MID|WIN_SAV|WIN_ACT,0,0,0,&copt,&bar
 			,isdefault ? "Edit Default Connection":"Edit Directory Entry"
 			,opts);
@@ -1792,14 +1836,15 @@ struct bbslist *show_bbslist(char *current, int connected)
 									"Commands:\n\n"
 									"~ CTRL-E ~ to edit the selected entry\n"
 									"~ CTRL-S ~ to modify the sort order\n"
-									" ~ ENTER ~ to connect to the selected entry";
+									"~ ENTER ~ to connect to the selected entry";
 				else
 					uifc.helpbuf=	"`SyncTERM Directory`\n\n"
 									"Commands:\n\n"
 									"~ CTRL-D ~ Quick-connect to a URL\n"
 									"~ CTRL-E ~ to edit the selected entry\n"
 									"~ CTRL-S ~ to modify the sort order\n"
-									" ~ ENTER ~ to connect to the selected entry";
+									"~ " ALT_KEY_NAMEP "-B ~ View scrollback of last session\n"
+									"~ ENTER ~ to connect to the selected entry";
 				if(opt != oldopt) {
 					if(list[opt]!=NULL && list[opt]->name[0]) {
 						sprintf(title, "%s - %s (%d calls / Last: %s", syncterm_version, (char *)(list[opt]), list[opt]->calls, list[opt]->connected?ctime(&list[opt]->connected):"Never\n");
@@ -2078,7 +2123,9 @@ struct bbslist *show_bbslist(char *current, int connected)
 								"~ Font Management ~\n"
 								"        Configure additional font files\n\n"
 								"~ Program Settings ~\n"
-								"        Modify hardware and screen/video settings\n\n";
+								"        Modify hardware and screen/video settings\n\n"
+								"~ " ALT_KEY_NAMEP "-B ~\n"
+								"        View scrollback of last session\n";
 				if(oldopt != -2)
 					settitle(syncterm_version);
 				oldopt=-2;
diff --git a/src/syncterm/menu.c b/src/syncterm/menu.c
index fed36f7c257093cc45de593ebdef532327ebabda..c93e00d065b0bc4d66ac3ecda5cbaba977f3740c 100644
--- a/src/syncterm/menu.c
+++ b/src/syncterm/menu.c
@@ -138,7 +138,7 @@ int syncmenu(struct bbslist *bbs, int *speed)
 						,"Change Log Level"
 						,"Capture Control ("ALT_KEY_NAMEP"-C)"
 						,"ANSI Music Control ("ALT_KEY_NAMEP"-M)"
-						,"Font Control ("ALT_KEY_NAMEP"-F)"
+						,"Font Setup ("ALT_KEY_NAMEP"-F)"
 						,"Toggle Doorway Mode"
 #ifndef WITHOUT_OOII
 						,"Toggle Operation Overkill ][ Mode"