diff --git a/src/c_console.cpp b/src/c_console.cpp
index 2d164c478..3064abb0d 100644
--- a/src/c_console.cpp
+++ b/src/c_console.cpp
@@ -100,7 +100,7 @@ extern bool		advancedemo;
 extern FBaseCVar *CVars;
 extern FConsoleCommand *Commands[FConsoleCommand::HASH_SIZE];
 
-int			ConCols, PhysRows;
+unsigned	ConCols;
 int			ConWidth;
 bool		vidactive = false;
 bool		cursoron = false;
@@ -112,12 +112,13 @@ constate_e	ConsoleState = c_up;
 static int TopLine, InsertLine;
 
 static void ClearConsole ();
-static void C_PasteText(FString clip, BYTE *buffer, int len);
 
 struct GameAtExit
 {
+	GameAtExit(FString str) : Command(str) {}
+
 	GameAtExit *Next;
-	char Command[1];
+	FString Command;
 };
 
 static GameAtExit *ExitCmdList;
@@ -139,27 +140,9 @@ static bool ConsoleDrawing;
 static char *work = NULL;
 static int worklen = 0;
 
-
-struct History
-{
-	struct History *Older;
-	struct History *Newer;
-	char String[1];
-};
-
-// CmdLine[0]  = # of chars on command line
-// CmdLine[1]  = cursor position
-// CmdLine[2+] = command line (max 255 chars + NULL)
-// CmdLine[259]= offset from beginning of cmdline to display
-static BYTE CmdLine[260];
-
-#define MAXHISTSIZE 50
-static struct History *HistHead = NULL, *HistTail = NULL, *HistPos = NULL;
-static int HistSize;
-
-CVAR (Float, con_notifytime, 3.f, CVAR_ARCHIVE)
-CVAR (Bool, con_centernotify, false, CVAR_ARCHIVE)
-CUSTOM_CVAR (Int, con_scaletext, 1, CVAR_ARCHIVE)		// Scale notify text at high resolutions?
+CVAR(Float, con_notifytime, 3.f, CVAR_ARCHIVE)
+CVAR(Bool, con_centernotify, false, CVAR_ARCHIVE)
+CUSTOM_CVAR(Int, con_scaletext, 1, CVAR_ARCHIVE)		// Scale notify text at high resolutions?
 {
 	if (self < 0) self = 0;
 	if (self > 3) self = 3;
@@ -172,10 +155,16 @@ CUSTOM_CVAR(Int, con_scale, 0, CVAR_ARCHIVE)
 
 int active_con_scale()
 {
-	if (con_scale == 0)
-		return uiscale;
-	else
-		return con_scale;
+	int scale = con_scale;
+	if (scale <= 0)
+	{
+		scale = CleanXfac - 1;
+		if (scale <= 0)
+		{
+			scale = 1;
+		}
+	}
+	return scale;
 }
 
 int active_con_scaletext()
@@ -197,19 +186,229 @@ CUSTOM_CVAR(Float, con_alpha, 0.75f, CVAR_ARCHIVE)
 }
 
 // Command to run when Ctrl-D is pressed at start of line
-CVAR (String, con_ctrl_d, "", CVAR_ARCHIVE|CVAR_GLOBALCONFIG)
+CVAR(String, con_ctrl_d, "", CVAR_ARCHIVE | CVAR_GLOBALCONFIG)
+
+
+struct History
+{
+	struct History *Older;
+	struct History *Newer;
+	FString String;
+};
+
+struct FCommandBuffer
+{
+	FString Text;	// The actual command line text
+	unsigned CursorPos;
+	unsigned StartPos;	// First character to display
+
+	FCommandBuffer()
+	{
+		CursorPos = StartPos = 0;
+	}
+
+	FCommandBuffer(const FCommandBuffer &o)
+	{
+		Text = o.Text;
+		CursorPos = o.CursorPos;
+		StartPos = o.StartPos;
+	}
+
+	void Draw(int x, int y, int scale, bool cursor)
+	{
+		if (scale == 1)
+		{
+			screen->DrawChar(ConFont, CR_ORANGE, x, y, '\x1c', TAG_DONE);
+			screen->DrawText(ConFont, CR_ORANGE, x + ConFont->GetCharWidth(0x1c), y,
+				&Text[StartPos], TAG_DONE);
+
+			if (cursor)
+			{
+				screen->DrawChar(ConFont, CR_YELLOW,
+					x + ConFont->GetCharWidth(0x1c) + (CursorPos - StartPos) * ConFont->GetCharWidth(0xb),
+					y, '\xb', TAG_DONE);
+			}
+		}
+		else
+		{
+			screen->DrawChar(ConFont, CR_ORANGE, x, y, '\x1c',
+				DTA_VirtualWidth, screen->GetWidth() / scale,
+				DTA_VirtualHeight, screen->GetHeight() / scale,
+				DTA_KeepRatio, true, TAG_DONE);
+
+			screen->DrawText(ConFont, CR_ORANGE, x + ConFont->GetCharWidth(0x1c), y,
+				&Text[StartPos],
+				DTA_VirtualWidth, screen->GetWidth() / scale,
+				DTA_VirtualHeight, screen->GetHeight() / scale,
+				DTA_KeepRatio, true, TAG_DONE);
+
+			if (cursor)
+			{
+				screen->DrawChar(ConFont, CR_YELLOW,
+					x + ConFont->GetCharWidth(0x1c) + (CursorPos - StartPos) * ConFont->GetCharWidth(0xb),
+					y, '\xb',
+					DTA_VirtualWidth, screen->GetWidth() / scale,
+					DTA_VirtualHeight, screen->GetHeight() / scale,
+					DTA_KeepRatio, true, TAG_DONE);
+			}
+		}
+	}
+
+	void MakeStartPosGood()
+	{
+		int n = StartPos;
+		unsigned cols = ConCols / active_con_scale();
+
+		if (StartPos >= Text.Len())
+		{ // Start of visible line is beyond end of line
+			n = CursorPos - cols + 2;
+		}
+		if ((CursorPos - StartPos) >= cols - 2)
+		{ // The cursor is beyond the visible part of the line
+			n = CursorPos - cols + 2;
+		}
+		if (StartPos > CursorPos)
+		{ // The cursor is in front of the visible part of the line
+			n = CursorPos;
+		}
+		StartPos = MAX(0, n);
+	}
+
+	void CursorStart()
+	{
+		CursorPos = 0;
+		StartPos = 0;
+	}
+
+	void CursorEnd()
+	{
+		CursorPos = (unsigned)Text.Len();
+		StartPos = 0;
+		MakeStartPosGood();
+	}
+
+	void CursorLeft()
+	{
+		if (CursorPos > 0)
+		{
+			CursorPos--;
+			MakeStartPosGood();
+		}
+	}
+
+	void CursorRight()
+	{
+		if (CursorPos < Text.Len())
+		{
+			CursorPos++;
+			MakeStartPosGood();
+		}
+	}
+
+	void DeleteLeft()
+	{
+		if (CursorPos > 0)
+		{
+			Text.Remove(CursorPos - 1, 1);
+			CursorPos--;
+			MakeStartPosGood();
+		}
+	}
+
+	void DeleteRight()
+	{
+		if (CursorPos < Text.Len())
+		{
+			Text.Remove(CursorPos, 1);
+			MakeStartPosGood();
+		}
+	}
+
+	void AddChar(int character)
+	{
+		///FIXME: Not Unicode-aware
+		if (CursorPos == Text.Len())
+		{
+			Text += char(character);
+		}
+		else
+		{
+			char foo = char(character);
+			Text.Insert(CursorPos, &foo, 1);
+		}
+		CursorPos++;
+		MakeStartPosGood();
+	}
+
+	void AddString(FString clip)
+	{
+		if (clip.IsNotEmpty())
+		{
+			// Only paste the first line.
+			long brk = clip.IndexOfAny("\r\n\b");
+			if (brk >= 0)
+			{
+				clip.Truncate(brk);
+			}
+			if (Text.IsEmpty())
+			{
+				Text = clip;
+			}
+			else
+			{
+				Text.Insert(CursorPos, clip);
+			}
+			CursorPos += (unsigned)clip.Len();
+			MakeStartPosGood();
+		}
+	}
+
+	void SetString(FString str)
+	{
+		Text = str;
+		CursorPos = (unsigned)Text.Len();
+		MakeStartPosGood();
+	}
+};
+static FCommandBuffer CmdLine;
+
+#define MAXHISTSIZE 50
+static struct History *HistHead = NULL, *HistTail = NULL, *HistPos = NULL;
+static int HistSize;
 
 #define NUMNOTIFIES 4
 #define NOTIFYFADETIME 6
 
-static struct NotifyText
+struct FNotifyText
 {
 	int TimeOut;
 	int PrintLevel;
 	FString Text;
-} NotifyStrings[NUMNOTIFIES];
+};
+
+struct FNotifyBuffer
+{
+public:
+	FNotifyBuffer();
+	void AddString(int printlevel, FString source);
+	void Shift(int maxlines);
+	void Clear() { Text.Clear(); }
+	void Tick();
+	void Draw();
+
+private:
+	TArray<FNotifyText> Text;
+	int Top;
+	int TopGoal;
+	enum { NEWLINE, APPENDLINE, REPLACELINE } AddType;
+};
+static FNotifyBuffer NotifyStrings;
+
+CUSTOM_CVAR(Int, con_notifylines, NUMNOTIFIES, CVAR_GLOBALCONFIG | CVAR_ARCHIVE)
+{
+	NotifyStrings.Shift(self);
+}
 
-static int NotifyTop, NotifyTopGoal;
 
 int PrintColors[PRINTLEVELS+2] = { CR_RED, CR_GOLD, CR_GRAY, CR_GREEN, CR_GREEN, CR_GOLD };
 
@@ -217,8 +416,6 @@ static void setmsgcolor (int index, int color);
 
 FILE *Logfile = NULL;
 
-void C_AddNotifyString (int printlevel, const char *source);
-
 
 FIntCVar msglevel ("msg", 0, CVAR_ARCHIVE);
 
@@ -312,7 +509,7 @@ void DequeueConsoleText ()
 		TextQueue *next = queued->Next;
 		if (queued->bNotify)
 		{
-			C_AddNotifyString (queued->PrintLevel, queued->Text);
+			NotifyStrings.AddString(queued->PrintLevel, queued->Text);
 		}
 		else
 		{
@@ -358,7 +555,6 @@ void C_InitConsole (int width, int height, bool ingame)
 	}
 	ConWidth = (width - LEFTMARGIN - RIGHTMARGIN);
 	ConCols = ConWidth / cwidth;
-	PhysRows = height / cheight;
 
 	if (conbuffer == NULL) conbuffer = new FConsoleBuffer;
 }
@@ -377,16 +573,14 @@ CCMD (atexit)
 		GameAtExit *record = ExitCmdList;
 		while (record != NULL)
 		{
-			Printf ("%s\n", record->Command);
+			Printf ("%s\n", record->Command.GetChars());
 			record = record->Next;
 		}
 		return;
 	}
 	for (int i = 1; i < argv.argc(); ++i)
 	{
-		GameAtExit *record = (GameAtExit *)M_Malloc (
-			sizeof(GameAtExit)+strlen(argv[i]));
-		strcpy (record->Command, argv[i]);
+		GameAtExit *record = new GameAtExit(argv[i]);
 		record->Next = ExitCmdList;
 		ExitCmdList = record;
 	}
@@ -408,8 +602,8 @@ void C_DeinitConsole ()
 	while (cmd != NULL)
 	{
 		GameAtExit *next = cmd->Next;
-		AddCommandString (cmd->Command);
-		M_Free (cmd);
+		AddCommandString (cmd->Command.LockBuffer());
+		delete cmd;
 		cmd = next;
 	}
 
@@ -419,7 +613,7 @@ void C_DeinitConsole ()
 	while (hist != NULL)
 	{
 		History *next = hist->Newer;
-		free (hist);
+		delete hist;
 		hist = next;
 	}
 	HistTail = HistHead = HistPos = NULL;
@@ -494,22 +688,30 @@ static void setmsgcolor (int index, int color)
 
 extern int DisplayWidth;
 
-void C_AddNotifyString (int printlevel, const char *source)
+FNotifyBuffer::FNotifyBuffer()
 {
-	static enum
-	{
-		NEWLINE,
-		APPENDLINE,
-		REPLACELINE
-	} addtype = NEWLINE;
+	Top = TopGoal = 0;
+	AddType = NEWLINE;
+}
 
+void FNotifyBuffer::Shift(int maxlines)
+{
+	if (maxlines >= 0 && Text.Size() > (unsigned)maxlines)
+	{
+		Text.Delete(0, Text.Size() - maxlines);
+	}
+}
+
+void FNotifyBuffer::AddString(int printlevel, FString source)
+{
 	FBrokenLines *lines;
-	int i, len, width;
+	int i, width;
 
 	if ((printlevel != 128 && !show_messages) ||
-		!(len = (int)strlen (source)) ||
+		source.IsEmpty() ||
 		gamestate == GS_FULLCONSOLE ||
-		gamestate == GS_DEMOSCREEN)
+		gamestate == GS_DEMOSCREEN ||
+		con_notifylines == 0)
 		return;
 
 	if (ConsoleDrawing)
@@ -527,15 +729,18 @@ void C_AddNotifyString (int printlevel, const char *source)
 		width = DisplayWidth / active_con_scaletext();
 	}
 
-	if (addtype == APPENDLINE && NotifyStrings[NUMNOTIFIES-1].PrintLevel == printlevel)
+	if (AddType == APPENDLINE && Text.Size() > 0 && Text[Text.Size() - 1].PrintLevel == printlevel)
 	{
-		FString str = NotifyStrings[NUMNOTIFIES-1].Text + source;
+		FString str = Text[Text.Size() - 1].Text + source;
 		lines = V_BreakLines (SmallFont, width, str);
 	}
 	else
 	{
 		lines = V_BreakLines (SmallFont, width, source);
-		addtype = (addtype == APPENDLINE) ? NEWLINE : addtype;
+		if (AddType == APPENDLINE)
+		{
+			AddType = NEWLINE;
+		}
 	}
 
 	if (lines == NULL)
@@ -543,30 +748,37 @@ void C_AddNotifyString (int printlevel, const char *source)
 
 	for (i = 0; lines[i].Width >= 0; i++)
 	{
-		if (addtype == NEWLINE)
+		FNotifyText newline;
+
+		newline.Text = lines[i].Text;
+		newline.TimeOut = gametic + int(con_notifytime * TICRATE);
+		newline.PrintLevel = printlevel;
+		if (AddType == NEWLINE || Text.Size() == 0)
 		{
-			for (int j = 0; j < NUMNOTIFIES-1; ++j)
+			if (con_notifylines > 0)
 			{
-				NotifyStrings[j] = NotifyStrings[j+1];
+				Shift(con_notifylines - 1);
 			}
+			Text.Push(newline);
 		}
-		NotifyStrings[NUMNOTIFIES-1].Text = lines[i].Text;
-		NotifyStrings[NUMNOTIFIES-1].TimeOut = gametic + (int)(con_notifytime * TICRATE);
-		NotifyStrings[NUMNOTIFIES-1].PrintLevel = printlevel;
-		addtype = NEWLINE;
+		else
+		{
+			Text[Text.Size() - 1] = newline;
+		}
+		AddType = NEWLINE;
 	}
 
 	V_FreeBrokenLines (lines);
 	lines = NULL;
 
-	switch (source[len-1])
+	switch (source[source.Len()-1])
 	{
-	case '\r':	addtype = REPLACELINE;	break;
-	case '\n':	addtype = NEWLINE;		break;
-	default:	addtype = APPENDLINE;	break;
+	case '\r':	AddType = REPLACELINE;	break;
+	case '\n':	AddType = NEWLINE;		break;
+	default:	AddType = APPENDLINE;	break;
 	}
 
-	NotifyTopGoal = 0;
+	TopGoal = 0;
 }
 
 void AddToConsole (int printlevel, const char *text)
@@ -589,7 +801,7 @@ int PrintString (int printlevel, const char *outline)
 		AddToConsole (printlevel, outline);
 		if (vidactive && screen && SmallFont)
 		{
-			C_AddNotifyString (printlevel, outline);
+			NotifyStrings.AddString(printlevel, outline);
 			maybedrawnow (false, false);
 		}
 	}
@@ -657,10 +869,7 @@ int DPrintf (int level, const char *format, ...)
 
 void C_FlushDisplay ()
 {
-	int i;
-
-	for (i = 0; i < NUMNOTIFIES; i++)
-		NotifyStrings[i].TimeOut = 0;
+	NotifyStrings.Clear();
 }
 
 void C_AdjustBottom ()
@@ -679,7 +888,7 @@ void C_NewModeAdjust ()
 }
 
 int consoletic = 0;
-void C_Ticker ()
+void C_Ticker()
 {
 	static int lasttic = 0;
 	consoletic++;
@@ -721,28 +930,43 @@ void C_Ticker ()
 	}
 
 	lasttic = consoletic;
+	NotifyStrings.Tick();
+}
 
-	if (NotifyTopGoal > NotifyTop)
+void FNotifyBuffer::Tick()
+{
+	if (TopGoal > Top)
 	{
-		NotifyTop++;
+		Top++;
 	}
-	else if (NotifyTopGoal < NotifyTop)
+	else if (TopGoal < Top)
 	{
-		NotifyTop--;
+		Top--;
+	}
+
+	// Remove lines from the beginning that have expired.
+	unsigned i;
+	for (i = 0; i < Text.Size(); ++i)
+	{
+		if (Text[i].TimeOut != 0 && Text[i].TimeOut > gametic)
+			break;
+	}
+	if (i > 0)
+	{
+		Text.Delete(0, i);
 	}
 }
 
-static void C_DrawNotifyText ()
+void FNotifyBuffer::Draw()
 {
 	bool center = (con_centernotify != 0.f);
-	int i, line, lineadv, color, j, skip;
+	int line, lineadv, color, j;
 	bool canskip;
 	
 	if (gamestate == GS_FULLCONSOLE || gamestate == GS_DEMOSCREEN/* || menuactive != MENU_Off*/)
 		return;
 
-	line = NotifyTop;
-	skip = 0;
+	line = Top;
 	canskip = true;
 
 	lineadv = SmallFont->GetHeight ();
@@ -753,67 +977,60 @@ static void C_DrawNotifyText ()
 
 	BorderTopRefresh = screen->GetPageCount ();
 
-	for (i = 0; i < NUMNOTIFIES; i++)
+	for (unsigned i = 0; i < Text.Size(); ++ i)
 	{
-		if (NotifyStrings[i].TimeOut == 0)
+		FNotifyText &notify = Text[i];
+
+		if (notify.TimeOut == 0)
 			continue;
 
-		j = NotifyStrings[i].TimeOut - gametic;
+		j = notify.TimeOut - gametic;
 		if (j > 0)
 		{
-			if (!show_messages && NotifyStrings[i].PrintLevel != 128)
+			if (!show_messages && notify.PrintLevel != 128)
 				continue;
 
-			double alpha;
+			double alpha = (j < NOTIFYFADETIME) ? 1. * j / NOTIFYFADETIME : 1;
 
-			if (j < NOTIFYFADETIME)
-			{
-				alpha = 1. * j / NOTIFYFADETIME;
-			}
-			else
-			{
-				alpha = 1;
-			}
-
-			if (NotifyStrings[i].PrintLevel >= PRINTLEVELS)
+			if (notify.PrintLevel >= PRINTLEVELS)
 				color = CR_UNTRANSLATED;
 			else
-				color = PrintColors[NotifyStrings[i].PrintLevel];
+				color = PrintColors[notify.PrintLevel];
 
 			if (active_con_scaletext() == 0)
 			{
 				if (!center)
-					screen->DrawText (SmallFont, color, 0, line, NotifyStrings[i].Text,
+					screen->DrawText (SmallFont, color, 0, line, notify.Text,
 						DTA_CleanNoMove, true, DTA_AlphaF, alpha, TAG_DONE);
 				else
 					screen->DrawText (SmallFont, color, (SCREENWIDTH -
-						SmallFont->StringWidth (NotifyStrings[i].Text)*CleanXfac)/2,
-						line, NotifyStrings[i].Text, DTA_CleanNoMove, true,
+						SmallFont->StringWidth (notify.Text)*CleanXfac)/2,
+						line, notify.Text, DTA_CleanNoMove, true,
 						DTA_AlphaF, alpha, TAG_DONE);
 			}
 			else if (active_con_scaletext() == 1)
 			{
 				if (!center)
-					screen->DrawText (SmallFont, color, 0, line, NotifyStrings[i].Text,
+					screen->DrawText (SmallFont, color, 0, line, notify.Text,
 						DTA_AlphaF, alpha, TAG_DONE);
 				else
 					screen->DrawText (SmallFont, color, (SCREENWIDTH -
-						SmallFont->StringWidth (NotifyStrings[i].Text))/2,
-						line, NotifyStrings[i].Text,
+						SmallFont->StringWidth (notify.Text))/2,
+						line, notify.Text,
 						DTA_AlphaF, alpha, TAG_DONE);
 			}
 			else
 			{
 				if (!center)
-					screen->DrawText (SmallFont, color, 0, line, NotifyStrings[i].Text,
+					screen->DrawText (SmallFont, color, 0, line, notify.Text,
 						DTA_VirtualWidth, screen->GetWidth() / active_con_scaletext(),
 						DTA_VirtualHeight, screen->GetHeight() / active_con_scaletext(),
 						DTA_KeepRatio, true,
 						DTA_AlphaF, alpha, TAG_DONE);
 				else
 					screen->DrawText (SmallFont, color, (screen->GetWidth() -
-						SmallFont->StringWidth (NotifyStrings[i].Text) * active_con_scaletext()) / 2 / active_con_scaletext(),
-						line, NotifyStrings[i].Text,
+						SmallFont->StringWidth (notify.Text) * active_con_scaletext()) / 2 / active_con_scaletext(),
+						line, notify.Text,
 						DTA_VirtualWidth, screen->GetWidth() / active_con_scaletext(),
 						DTA_VirtualHeight, screen->GetHeight() / active_con_scaletext(),
 						DTA_KeepRatio, true,
@@ -826,16 +1043,15 @@ static void C_DrawNotifyText ()
 		{
 			if (canskip)
 			{
-				NotifyTop += lineadv;
+				Top += lineadv;
 				line += lineadv;
-				skip++;
 			}
-			NotifyStrings[i].TimeOut = 0;
+			notify.TimeOut = 0;
 		}
 	}
 	if (canskip)
 	{
-		NotifyTop = NotifyTopGoal;
+		Top = TopGoal;
 	}
 }
 
@@ -860,8 +1076,6 @@ void C_DrawConsole (bool hw2d)
 	int lines, left, offset;
 
 	int textScale = active_con_scale();
-	if (textScale == 0)
-		textScale = CleanXfac;
 
 	left = LEFTMARGIN;
 	lines = (ConBottom/textScale-ConFont->GetHeight()*2)/ConFont->GetHeight();
@@ -887,7 +1101,7 @@ void C_DrawConsole (bool hw2d)
 
 	if (ConsoleState == c_up)
 	{
-		C_DrawNotifyText ();
+		NotifyStrings.Draw();
 		return;
 	}
 	else if (ConBottom)
@@ -1037,44 +1251,8 @@ void C_DrawConsole (bool hw2d)
 			{
 				// Make a copy of the command line, in case an input event is handled
 				// while we draw the console and it changes.
-				CmdLine[2+CmdLine[0]] = 0;
-				FString command((char *)&CmdLine[2+CmdLine[259]]);
-				int cursorpos = CmdLine[1] - CmdLine[259];
-
-				if (textScale == 1)
-				{
-					screen->DrawChar(ConFont, CR_ORANGE, left, bottomline, '\x1c', TAG_DONE);
-					screen->DrawText(ConFont, CR_ORANGE, left + ConFont->GetCharWidth(0x1c), bottomline,
-						command, TAG_DONE);
-
-					if (cursoron)
-					{
-						screen->DrawChar(ConFont, CR_YELLOW, left + ConFont->GetCharWidth(0x1c) + cursorpos * ConFont->GetCharWidth(0xb),
-							bottomline, '\xb', TAG_DONE);
-					}
-				}
-				else
-				{
-					screen->DrawChar(ConFont, CR_ORANGE, left, bottomline, '\x1c',
-						DTA_VirtualWidth, screen->GetWidth() / textScale,
-						DTA_VirtualHeight, screen->GetHeight() / textScale,
-						DTA_KeepRatio, true, TAG_DONE);
-
-					screen->DrawText(ConFont, CR_ORANGE, left + ConFont->GetCharWidth(0x1c), bottomline,
-						command,
-						DTA_VirtualWidth, screen->GetWidth() / textScale,
-						DTA_VirtualHeight, screen->GetHeight() / textScale,
-						DTA_KeepRatio, true, TAG_DONE);
-
-					if (cursoron)
-					{
-						screen->DrawChar(ConFont, CR_YELLOW, left + ConFont->GetCharWidth(0x1c) + cursorpos * ConFont->GetCharWidth(0xb),
-							bottomline, '\xb',
-							DTA_VirtualWidth, screen->GetWidth() / textScale,
-							DTA_VirtualHeight, screen->GetHeight() / textScale,
-							DTA_KeepRatio, true, TAG_DONE);
-					}
-				}
+				FCommandBuffer command(CmdLine);
+				command.Draw(left, bottomline, textScale, cursoron);
 			}
 			if (RowAdjust && ConBottom >= ConFont->GetHeight()*7/2)
 			{
@@ -1146,35 +1324,8 @@ void C_HideConsole ()
 	}
 }
 
-static void makestartposgood ()
+static bool C_HandleKey (event_t *ev, FCommandBuffer &buffer)
 {
-	int n;
-	int pos = CmdLine[259];
-	int curs = CmdLine[1];
-	int len = CmdLine[0];
-
-	n = pos;
-
-	if (pos >= len)
-	{ // Start of visible line is beyond end of line
-		n = curs - ConCols + 2;
-	}
-	if ((curs - pos) >= ConCols - 2)
-	{ // The cursor is beyond the visible part of the line
-		n = curs - ConCols + 2;
-	}
-	if (pos > curs)
-	{ // The cursor is in front of the visible part of the line
-		n = curs;
-	}
-	if (n < 0)
-		n = 0;
-	CmdLine[259] = n;
-}
-
-static bool C_HandleKey (event_t *ev, BYTE *buffer, int len)
-{
-	int i;
 	int data1 = ev->data1;
 
 	switch (ev->subtype)
@@ -1184,29 +1335,8 @@ static bool C_HandleKey (event_t *ev, BYTE *buffer, int len)
 
 	case EV_GUI_Char:
 		// Add keypress to command line
-		if (buffer[0] < len)
-		{
-			if (buffer[1] == buffer[0])
-			{
-				buffer[buffer[0] + 2] = BYTE(ev->data1);
-			}
-			else
-			{
-				char *c, *e;
-
-				e = (char *)&buffer[buffer[0] + 1];
-				c = (char *)&buffer[buffer[1] + 2];
-
-				for (; e >= c; e--)
-					*(e + 1) = *e;
-
-				*c = char(ev->data1);
-			}
-			buffer[0]++;
-			buffer[1]++;
-			makestartposgood ();
-			HistPos = NULL;
-		}
+		buffer.AddChar(ev->data1);
+		HistPos = NULL;
 		TabbedLast = false;
 		TabbedList = false;
 		break;
@@ -1235,7 +1365,7 @@ static bool C_HandleKey (event_t *ev, BYTE *buffer, int len)
 		case GK_PGUP:
 			if (ev->data3 & (GKM_SHIFT|GKM_CTRL))
 			{ // Scroll console buffer up one page
-				RowAdjust += (SCREENHEIGHT-4) /
+				RowAdjust += (SCREENHEIGHT-4)/active_con_scale() /
 					((gamestate == GS_FULLCONSOLE || gamestate == GS_STARTUP) ? ConFont->GetHeight() : ConFont->GetHeight()*2) - 3;
 			}
 			else if (RowAdjust < conbuffer->GetFormattedLineCount())
@@ -1258,7 +1388,7 @@ static bool C_HandleKey (event_t *ev, BYTE *buffer, int len)
 		case GK_PGDN:
 			if (ev->data3 & (GKM_SHIFT|GKM_CTRL))
 			{ // Scroll console buffer down one page
-				const int scrollamt = (SCREENHEIGHT-4) /
+				const int scrollamt = (SCREENHEIGHT-4)/active_con_scale() /
 					((gamestate == GS_FULLCONSOLE || gamestate == GS_STARTUP) ? ConFont->GetHeight() : ConFont->GetHeight()*2) - 3;
 				if (RowAdjust < scrollamt)
 				{
@@ -1289,7 +1419,7 @@ static bool C_HandleKey (event_t *ev, BYTE *buffer, int len)
 			}
 			else
 			{ // Move cursor to start of line
-				buffer[1] = buffer[len+4] = 0;
+				buffer.CursorStart();
 			}
 			break;
 
@@ -1300,66 +1430,30 @@ static bool C_HandleKey (event_t *ev, BYTE *buffer, int len)
 			}
 			else
 			{ // Move cursor to end of line
-				buffer[1] = buffer[0];
-				makestartposgood ();
+				buffer.CursorEnd();
 			}
 			break;
 
 		case GK_LEFT:
 			// Move cursor left one character
-			if (buffer[1])
-			{
-				buffer[1]--;
-				makestartposgood ();
-			}
+			buffer.CursorLeft();
 			break;
 
 		case GK_RIGHT:
 			// Move cursor right one character
-			if (buffer[1] < buffer[0])
-			{
-				buffer[1]++;
-				makestartposgood ();
-			}
+			buffer.CursorRight();
 			break;
 
 		case '\b':
 			// Erase character to left of cursor
-			if (buffer[0] && buffer[1])
-			{
-				char *c, *e;
-
-				e = (char *)&buffer[buffer[0] + 2];
-				c = (char *)&buffer[buffer[1] + 2];
-
-				for (; c < e; c++)
-					*(c - 1) = *c;
-				
-				buffer[0]--;
-				buffer[1]--;
-				if (buffer[len+4])
-					buffer[len+4]--;
-				makestartposgood ();
-			}
+			buffer.DeleteLeft();
 			TabbedLast = false;
 			TabbedList = false;
 			break;
 
 		case GK_DEL:
 			// Erase character under cursor
-			if (buffer[1] < buffer[0])
-			{
-				char *c, *e;
-
-				e = (char *)&buffer[buffer[0] + 2];
-				c = (char *)&buffer[buffer[1] + 3];
-
-				for (; c < e; c++)
-					*(c - 1) = *c;
-
-				buffer[0]--;
-				makestartposgood ();
-			}
+			buffer.DeleteRight();
 			TabbedLast = false;
 			TabbedList = false;
 			break;
@@ -1377,10 +1471,7 @@ static bool C_HandleKey (event_t *ev, BYTE *buffer, int len)
 
 			if (HistPos)
 			{
-				strcpy ((char *)&buffer[2], HistPos->String);
-				buffer[0] = buffer[1] = (BYTE)strlen ((char *)&buffer[2]);
-				buffer[len+4] = 0;
-				makestartposgood();
+				buffer.SetString(HistPos->String);
 			}
 
 			TabbedLast = false;
@@ -1392,17 +1483,13 @@ static bool C_HandleKey (event_t *ev, BYTE *buffer, int len)
 			if (HistPos && HistPos->Newer)
 			{
 				HistPos = HistPos->Newer;
-			
-				strcpy ((char *)&buffer[2], HistPos->String);
-				buffer[0] = buffer[1] = (BYTE)strlen ((char *)&buffer[2]);
+				buffer.SetString(HistPos->String);
 			}
 			else
 			{
 				HistPos = NULL;
-				buffer[0] = buffer[1] = 0;
+				buffer.SetString("");
 			}
-			buffer[len+4] = 0;
-			makestartposgood();
 			TabbedLast = false;
 			TabbedList = false;
 			break;
@@ -1410,24 +1497,19 @@ static bool C_HandleKey (event_t *ev, BYTE *buffer, int len)
 		case 'X':
 			if (ev->data3 & GKM_CTRL)
 			{
-				buffer[1] = buffer[0] = 0;
+				buffer.SetString("");
 				TabbedLast = TabbedList = false;
 			}
 			break;
 
 		case 'D':
-			if (ev->data3 & GKM_CTRL && buffer[0] == 0)
+			if (ev->data3 & GKM_CTRL && buffer.Text.Len() == 0)
 			{ // Control-D pressed on an empty line
-				int replen = (int)strlen (con_ctrl_d);
-
-				if (replen == 0)
+				if (strlen(con_ctrl_d) == 0)
+				{
 					break;	// Replacement is empty, so do nothing
-
-				if (replen > len)
-					replen = len;
-
-				memcpy (&buffer[2], con_ctrl_d, replen);
-				buffer[0] = buffer[1] = replen;
+				}
+				buffer.SetString(*con_ctrl_d);
 			}
 			else
 			{
@@ -1438,16 +1520,16 @@ static bool C_HandleKey (event_t *ev, BYTE *buffer, int len)
 		case '\r':
 			// Execute command line (ENTER)
 
-			buffer[2 + buffer[0]] = 0;
+			buffer.Text.StripLeftRight();
+			Printf(127, TEXTCOLOR_WHITE "]%s\n", buffer.Text.GetChars());
+			AddCommandString(buffer.Text.LockBuffer());
+			buffer.Text.UnlockBuffer();
 
-			for (i = 0; i < buffer[0] && isspace(buffer[2+i]); ++i)
-			{
-			}
-			if (i == buffer[0])
+			if (buffer.Text.Len() == 0)
 			{
 				 // Command line is empty, so do nothing to the history
 			}
-			else if (HistHead && stricmp (HistHead->String, (char *)&buffer[2]) == 0)
+			else if (HistHead && HistHead->String.CompareNoCase(buffer.Text) == 0)
 			{
 				// Command line was the same as the previous one,
 				// so leave the history list alone
@@ -1458,9 +1540,8 @@ static bool C_HandleKey (event_t *ev, BYTE *buffer, int len)
 				// or there is nothing in the history list,
 				// so add it to the history list.
 
-				History *temp = (History *)M_Malloc (sizeof(struct History) + buffer[0]);
-
-				strcpy (temp->String, (char *)&buffer[2]);
+				History *temp = new History;
+				temp->String = buffer.Text;
 				temp->Older = HistHead;
 				if (HistHead)
 				{
@@ -1477,7 +1558,7 @@ static bool C_HandleKey (event_t *ev, BYTE *buffer, int len)
 				if (HistSize == MAXHISTSIZE)
 				{
 					HistTail = HistTail->Newer;
-					M_Free (HistTail->Older);
+					delete HistTail->Older;
 					HistTail->Older = NULL;
 				}
 				else
@@ -1486,9 +1567,7 @@ static bool C_HandleKey (event_t *ev, BYTE *buffer, int len)
 				}
 			}
 			HistPos = NULL;
-			Printf (127, TEXTCOLOR_WHITE "]%s\n", &buffer[2]);
-			buffer[0] = buffer[1] = buffer[len+4] = 0;
-			AddCommandString ((char *)&buffer[2]);
+			buffer.SetString("");
 			TabbedLast = false;
 			TabbedList = false;
 			break;
@@ -1514,7 +1593,7 @@ static bool C_HandleKey (event_t *ev, BYTE *buffer, int len)
 			}
 			else
 			{
-				buffer[0] = buffer[1] = buffer[len+4] = 0;
+				buffer.SetString("");
 				HistPos = NULL;
 				C_ToggleConsole ();
 			}
@@ -1532,15 +1611,15 @@ static bool C_HandleKey (event_t *ev, BYTE *buffer, int len)
 			{
 				if (data1 == 'C')
 				{ // copy to clipboard
-					if (buffer[0] > 0)
+					if (buffer.Text.IsNotEmpty())
 					{
-						buffer[2 + buffer[0]] = 0;
-						I_PutInClipboard ((char *)&buffer[2]);
+						I_PutInClipboard(buffer.Text);
 					}
 				}
 				else
 				{ // paste from clipboard
-					C_PasteText(I_GetFromClipboard(false), buffer, len);
+					buffer.AddString(I_GetFromClipboard(false));
+					HistPos = NULL;
 				}
 				break;
 			}
@@ -1550,7 +1629,8 @@ static bool C_HandleKey (event_t *ev, BYTE *buffer, int len)
 
 #ifdef __unix__
 	case EV_GUI_MButtonDown:
-		C_PasteText(I_GetFromClipboard(true), buffer, len);
+		buffer.AddString(I_GetFromClipboard(true));
+		HistPos = NULL;
 		break;
 #endif
 	}
@@ -1560,36 +1640,6 @@ static bool C_HandleKey (event_t *ev, BYTE *buffer, int len)
 	return true;
 }
 
-static void C_PasteText(FString clip, BYTE *buffer, int len)
-{
-	if (clip.IsNotEmpty())
-	{
-		// Only paste the first line.
-		long brk = clip.IndexOfAny("\r\n\b");
-		int cliplen = brk >= 0 ? brk : (int)clip.Len();
-
-		// Make sure there's room for the whole thing.
-		if (buffer[0] + cliplen > len)
-		{
-			cliplen = len - buffer[0];
-		}
-
-		if (cliplen > 0)
-		{
-			if (buffer[1] < buffer[0])
-			{
-				memmove (&buffer[2 + buffer[1] + cliplen],
-						 &buffer[2 + buffer[1]], buffer[0] - buffer[1]);
-			}
-			memcpy (&buffer[2 + buffer[1]], clip, cliplen);
-			buffer[0] += cliplen;
-			buffer[1] += cliplen;
-			makestartposgood ();
-			HistPos = NULL;
-		}
-	}
-}
-
 bool C_Responder (event_t *ev)
 {
 	if (ev->type != EV_GUI_Event ||
@@ -1600,7 +1650,7 @@ bool C_Responder (event_t *ev)
 		return false;
 	}
 
-	return C_HandleKey (ev, CmdLine, 255);
+	return C_HandleKey(ev, CmdLine);
 }
 
 CCMD (history)
@@ -1609,7 +1659,7 @@ CCMD (history)
 
 	while (hist)
 	{
-		Printf ("   %s\n", hist->String);
+		Printf ("   %s\n", hist->String.GetChars());
 		hist = hist->Newer;
 	}
 }
@@ -1793,7 +1843,7 @@ static int FindDiffPoint (FName name1, const char *str2)
 
 static void C_TabComplete (bool goForward)
 {
-	int i;
+	unsigned i;
 	int diffpoint;
 
 	if (!TabbedLast)
@@ -1801,25 +1851,20 @@ static void C_TabComplete (bool goForward)
 		bool cancomplete;
 
 		// Skip any spaces at beginning of command line
-		if (CmdLine[2] == ' ')
+		for (i = 0; i < CmdLine.Text.Len(); ++i)
 		{
-			for (i = 0; i < CmdLine[0]; i++)
-				if (CmdLine[2+i] != ' ')
-					break;
-
-			TabStart = i + 2;
+			if (CmdLine.Text[i] != ' ')
+				break;
 		}
-		else
-		{
-			TabStart = 2;
+		if (i == CmdLine.Text.Len())
+		{ // Line was nothing but spaces
+			return;
 		}
+		TabStart = i;
 
-		if (TabStart == CmdLine[0] + 2)
-			return;		// Line was nothing but spaces
+		TabSize = (int)CmdLine.Text.Len() - TabStart;
 
-		TabSize = CmdLine[0] - TabStart + 2;
-
-		if (!FindTabCommand ((char *)(CmdLine + TabStart), &TabPos, TabSize))
+		if (!FindTabCommand(&CmdLine.Text[TabStart], &TabPos, TabSize))
 			return;		// No initial matches
 
 		// Show a list of possible completions, if more than one.
@@ -1842,7 +1887,7 @@ static void C_TabComplete (bool goForward)
 		{ // Find the last matching tab, then go one past it.
 			while (++TabPos < (int)TabCommands.Size())
 			{
-				if (FindDiffPoint (TabCommands[TabPos].TabName, (char *)(CmdLine + TabStart)) < TabSize)
+				if (FindDiffPoint(TabCommands[TabPos].TabName, &CmdLine.Text[TabStart]) < TabSize)
 				{
 					break;
 				}
@@ -1859,27 +1904,26 @@ static void C_TabComplete (bool goForward)
 		(!goForward && --TabPos < 0))
 	{
 		TabbedLast = false;
-		CmdLine[0] = CmdLine[1] = TabSize;
+		CmdLine.Text.Truncate(TabSize);
 	}
 	else
 	{
-		diffpoint = FindDiffPoint (TabCommands[TabPos].TabName, (char *)(CmdLine + TabStart));
+		diffpoint = FindDiffPoint(TabCommands[TabPos].TabName, &CmdLine.Text[TabStart]);
 
 		if (diffpoint < TabSize)
 		{
 			// No more matches
 			TabbedLast = false;
-			CmdLine[0] = CmdLine[1] = TabSize + TabStart - 2;
+			CmdLine.Text.Truncate(TabSize - TabStart);
 		}
 		else
-		{		
-			strcpy ((char *)(CmdLine + TabStart), TabCommands[TabPos].TabName.GetChars());
-			CmdLine[0] = CmdLine[1] = (BYTE)strlen ((char *)(CmdLine + 2)) + 1;
-			CmdLine[CmdLine[0] + 1] = ' ';
+		{
+			CmdLine.Text.Truncate(TabStart);
+			CmdLine.Text << TabCommands[TabPos].TabName << ' ';
 		}
 	}
-
-	makestartposgood ();
+	CmdLine.CursorPos = (unsigned)CmdLine.Text.Len();
+	CmdLine.MakeStartPosGood();
 }
 
 static bool C_TabCompleteList ()
@@ -1893,7 +1937,7 @@ static bool C_TabCompleteList ()
 
 	for (i = TabPos; i < (int)TabCommands.Size(); ++i)
 	{
-		if (FindDiffPoint (TabCommands[i].TabName, (char *)(CmdLine + TabStart)) < TabSize)
+		if (FindDiffPoint (TabCommands[i].TabName, &CmdLine.Text[TabStart]) < TabSize)
 		{
 			break;
 		}
@@ -1918,7 +1962,7 @@ static bool C_TabCompleteList ()
 	{
 		size_t x = 0;
 		maxwidth += 3;
-		Printf (TEXTCOLOR_BLUE "Completions for %s:\n", CmdLine+2);
+		Printf (TEXTCOLOR_BLUE "Completions for %s:\n", CmdLine.Text.GetChars());
 		for (i = TabPos; nummatches > 0; ++i, --nummatches)
 		{
 			// [Dusk] Print console commands blue, CVars green, aliases red.
@@ -1936,7 +1980,7 @@ static bool C_TabCompleteList ()
 
 			Printf ("%s%-*s", colorcode, int(maxwidth), TabCommands[i].TabName.GetChars());
 			x += maxwidth;
-			if (x > ConCols - maxwidth)
+			if (x > ConCols / active_con_scale() - maxwidth)
 			{
 				x = 0;
 				Printf ("\n");
@@ -1950,9 +1994,9 @@ static bool C_TabCompleteList ()
 		if (TabSize != commonsize)
 		{
 			TabSize = commonsize;
-			strncpy ((char *)CmdLine + TabStart, TabCommands[TabPos].TabName.GetChars(), commonsize);
-			CmdLine[0] = TabStart + commonsize - 2;
-			CmdLine[1] = CmdLine[0];
+			CmdLine.Text.Truncate(TabStart);
+			CmdLine.Text.AppendCStrPart(TabCommands[TabPos].TabName.GetChars(), commonsize);
+			CmdLine.CursorPos = (unsigned)CmdLine.Text.Len();
 		}
 		return false;
 	}
diff --git a/src/resourcefiles/resourcefile.cpp b/src/resourcefiles/resourcefile.cpp
index 912998d9a..603606341 100644
--- a/src/resourcefiles/resourcefile.cpp
+++ b/src/resourcefiles/resourcefile.cpp
@@ -95,7 +95,8 @@ void FResourceLump::LumpNameSetup(FString iname)
 {
 	long slash = iname.LastIndexOf('/');
 	FString base = (slash >= 0) ? iname.Mid(slash + 1) : iname;
-	base.Truncate(base.LastIndexOf('.'));
+	auto dot = base.LastIndexOf('.');
+	if (dot >= 0) base.Truncate(dot);
 	uppercopy(Name, base);
 	Name[8] = 0;
 	FullName = iname;
diff --git a/src/serializer.cpp b/src/serializer.cpp
index dec81e86f..8875b61f9 100644
--- a/src/serializer.cpp
+++ b/src/serializer.cpp
@@ -162,7 +162,7 @@ static const char *StringToUnicode(const char *cc, int size = -1)
 	int count = 0;
 	int count1 = 0;
 	out.Clear();
-	while (ch = (*c++) & 255)
+	while ((ch = (*c++) & 255))
 	{
 		count1++;
 		if (ch >= 128)
@@ -180,7 +180,7 @@ static const char *StringToUnicode(const char *cc, int size = -1)
 	out.Last() = 0;
 	c = cc;
 	int i = 0;
-	while (ch = (*c++) & 255)
+	while ((ch = (*c++) & 255))
 	{
 		utf8_encode(ch, &out[i], &count1);
 		i += count1;
diff --git a/src/v_video.cpp b/src/v_video.cpp
index 7d97db73d..3e91429cf 100644
--- a/src/v_video.cpp
+++ b/src/v_video.cpp
@@ -981,8 +981,6 @@ void DFrameBuffer::DrawRateStuff ()
 			int rate_x;
 
 			int textScale = active_con_scale();
-			if (textScale == 0)
-				textScale = CleanXfac;
 
 			chars = mysnprintf (fpsbuff, countof(fpsbuff), "%2u ms (%3u fps)", howlong, LastCount);
 			rate_x = Width / textScale - ConFont->StringWidth(&fpsbuff[0]);
diff --git a/src/zstring.cpp b/src/zstring.cpp
index f4a3a1fbb..b6e5b4b8d 100644
--- a/src/zstring.cpp
+++ b/src/zstring.cpp
@@ -343,28 +343,74 @@ FString &FString::operator += (char tail)
 
 FString &FString::AppendCStrPart (const char *tail, size_t tailLen)
 {
-	size_t len1 = Len();
-	ReallocBuffer (len1 + tailLen);
-	StrCopy (Chars + len1, tail, tailLen);
+	if (tailLen > 0)
+	{
+		size_t len1 = Len();
+		ReallocBuffer(len1 + tailLen);
+		StrCopy(Chars + len1, tail, tailLen);
+	}
 	return *this;
 }
 
 FString &FString::CopyCStrPart(const char *tail, size_t tailLen)
 {
-	ReallocBuffer(tailLen);
-	StrCopy(Chars, tail, tailLen);
+	if (tailLen > 0)
+	{
+		ReallocBuffer(tailLen);
+		StrCopy(Chars, tail, tailLen);
+	}
+	else
+	{
+		Data()->Release();
+		NullString.RefCount++;
+		Chars = &NullString.Nothing[0];
+	}
 	return *this;
 }
 
 void FString::Truncate(long newlen)
 {
-	if (newlen >= 0 && newlen < (long)Len())
+	if (newlen <= 0)
+	{
+		Data()->Release();
+		NullString.RefCount++;
+		Chars = &NullString.Nothing[0];
+	}
+	else if (newlen < (long)Len())
 	{
 		ReallocBuffer (newlen);
 		Chars[newlen] = '\0';
 	}
 }
 
+void FString::Remove(size_t index, size_t remlen)
+{
+	if (index < Len())
+	{
+		if (index + remlen >= Len())
+		{
+			Truncate((long)index);
+		}
+		else
+		{
+			remlen = Len() - remlen < remlen ? Len() - remlen : remlen;
+			if (Data()->RefCount == 1)
+			{ // Can do this in place
+				memmove(Chars + index, Chars + index + remlen, Len() - index - remlen);
+				Data()->Len -= (unsigned)remlen;
+			}
+			else
+			{ // Must do it in a copy
+				FStringData *old = Data();
+				AllocBuffer(old->Len - remlen);
+				StrCopy(Chars, old->Chars(), index);
+				StrCopy(Chars + index, old->Chars() + index + remlen, old->Len - index - remlen);
+				old->Release();
+			}
+		}
+	}
+}
+
 FString FString::Left (size_t numChars) const
 {
 	size_t len = Len();
@@ -589,6 +635,10 @@ void FString::StripLeft ()
 		if (!isspace(Chars[i]))
 			break;
 	}
+	if (i == 0)
+	{ // Nothing to strip.
+		return;
+	}
 	if (Data()->RefCount <= 1)
 	{
 		for (j = 0; i <= max; ++j, ++i)
@@ -620,6 +670,10 @@ void FString::StripLeft (const char *charset)
 		if (!strchr (charset, Chars[i]))
 			break;
 	}
+	if (i == 0)
+	{ // Nothing to strip.
+		return;
+	}
 	if (Data()->RefCount <= 1)
 	{
 		for (j = 0; i <= max; ++j, ++i)
@@ -640,11 +694,16 @@ void FString::StripLeft (const char *charset)
 void FString::StripRight ()
 {
 	size_t max = Len(), i;
-	for (i = max; i-- > 0; )
+	if (max == 0) return;
+	for (i = --max; i-- > 0; )
 	{
 		if (!isspace(Chars[i]))
 			break;
 	}
+	if (i == max)
+	{ // Nothing to strip.
+		return;
+	}
 	if (Data()->RefCount <= 1)
 	{
 		Chars[i+1] = '\0';
@@ -668,11 +727,15 @@ void FString::StripRight (const char *charset)
 {
 	size_t max = Len(), i;
 	if (max == 0) return;
-	for (i = max; i-- > 0; )
+	for (i = --max; i-- > 0; )
 	{
 		if (!strchr (charset, Chars[i]))
 			break;
 	}
+	if (i == max)
+	{ // Nothing to strip.
+		return;
+	}
 	if (Data()->RefCount <= 1)
 	{
 		Chars[i+1] = '\0';
@@ -701,6 +764,10 @@ void FString::StripLeftRight ()
 		if (!isspace(Chars[j]))
 			break;
 	}
+	if (i == 0 && j == max - 1)
+	{ // Nothing to strip.
+		return;
+	}
 	if (Data()->RefCount <= 1)
 	{
 		for (k = 0; i <= j; ++i, ++k)
@@ -713,8 +780,8 @@ void FString::StripLeftRight ()
 	else
 	{
 		FStringData *old = Data();
-		AllocBuffer (j - i);
-		StrCopy (Chars, old->Chars(), j - i);
+		AllocBuffer(j - i + 1);
+		StrCopy(Chars, old->Chars(), j - i + 1);
 		old->Release();
 	}
 }
@@ -768,25 +835,28 @@ void FString::Insert (size_t index, const char *instr)
 
 void FString::Insert (size_t index, const char *instr, size_t instrlen)
 {
-	size_t mylen = Len();
-	if (index > mylen)
+	if (instrlen > 0)
 	{
-		index = mylen;
-	}
-	if (Data()->RefCount <= 1)
-	{
-		ReallocBuffer (mylen + instrlen);
-		memmove (Chars + index + instrlen, Chars + index, (mylen - index + 1)*sizeof(char));
-		memcpy (Chars + index, instr, instrlen*sizeof(char));
-	}
-	else
-	{
-		FStringData *old = Data();
-		AllocBuffer (mylen + instrlen);
-		StrCopy (Chars, old->Chars(), index);
-		StrCopy (Chars + index, instr, instrlen);
-		StrCopy (Chars + index + instrlen, old->Chars() + index, mylen - index);
-		old->Release();
+		size_t mylen = Len();
+		if (index >= mylen)
+		{
+			AppendCStrPart(instr, instrlen);
+		}
+		else if (Data()->RefCount <= 1)
+		{
+			ReallocBuffer(mylen + instrlen);
+			memmove(Chars + index + instrlen, Chars + index, (mylen - index + 1) * sizeof(char));
+			memcpy(Chars + index, instr, instrlen * sizeof(char));
+		}
+		else
+		{
+			FStringData *old = Data();
+			AllocBuffer(mylen + instrlen);
+			StrCopy(Chars, old->Chars(), index);
+			StrCopy(Chars + index, instr, instrlen);
+			StrCopy(Chars + index + instrlen, old->Chars() + index, mylen - index);
+			old->Release();
+		}
 	}
 }
 
diff --git a/src/zstring.h b/src/zstring.h
index 00f373b59..ba9208719 100644
--- a/src/zstring.h
+++ b/src/zstring.h
@@ -268,6 +268,7 @@ public:
 	bool IsNotEmpty() const { return Len() != 0; }
 
 	void Truncate (long newlen);
+	void Remove(size_t index, size_t remlen);
 
 	int Compare (const FString &other) const { return strcmp (Chars, other.Chars); }
 	int Compare (const char *other) const { return strcmp (Chars, other); }