diff --git a/dub.json b/dub.json
index 2414149..67bde37 100644
--- a/dub.json
+++ b/dub.json
@@ -4,6 +4,7 @@
 	"sourcePaths": ["."],
 	"dependencies": {
 		"arsd-official:simpledisplay":"~master",
+		"arsd-official:minigui":"~master",
 		"arsd-official:dom":"~master",
 		"arsd-official:cgi":"~master",
 		"arsd-official:http":"~master",
@@ -31,6 +32,24 @@
 			],
 			"sourceFiles": ["simpledisplay.d", "color.d"]
 		},
+		{
+			"name": "minigui",
+			"description": "Small GUI widget library for Windows and Linux",
+			"targetType": "sourceLibrary",
+			"libs-posix": ["X11", "Xext", "GL", "GLU"],
+			"libs-windows": ["gdi32"],
+			"configurations": [
+				{
+					"name": "normal"
+				},
+				{
+					"name": "with-opengl",
+					"versions": ["with_opengl"],
+					"libs-windows": ["opengl32", "glu32"]
+				}
+			],
+			"sourceFiles": ["simpledisplay.d", "color.d", "minigui.d"]
+		},
 		{
 			"name": "dom",
 			"description": "HTML tag soup DOM library",
diff --git a/htmltotext.d b/htmltotext.d
index aaac147..272dadc 100644
--- a/htmltotext.d
+++ b/htmltotext.d
@@ -96,8 +96,11 @@ class HtmlConverter {
 					if(element.href != element.innerText) {
 						sink(' ', false);
 						sink('<', false);
+						// I want the link itself to NOT word wrap
+						// to make for easier double-clicking of it in
+						// the terminal
 						foreach(dchar ch; element.href)
-							sink(ch, false);
+							sink(ch, false, int.max);
 						sink('>', false);
 					}
 				break;
@@ -182,6 +185,7 @@ class HtmlConverter {
 				case "br":
 					sink('\n', true);
 				break;
+				case "tr":
 				case "div":
 					startBlock();
 
@@ -250,7 +254,8 @@ class HtmlConverter {
 	bool justOutputMargin = true;
 	int lineLength;
 
-	void sink(dchar item, bool preformatted) {
+	void sink(dchar item, bool preformatted, int lineWidthOverride = int.min) {
+		int width = lineWidthOverride == int.min ? this.width : lineWidthOverride;
 		if(!preformatted && isWhite(item)) {
 			if(!justOutputWhitespace) {
 				item = ' ';
diff --git a/http2.d b/http2.d
index c4eb1ef..491138c 100644
--- a/http2.d
+++ b/http2.d
@@ -1124,7 +1124,7 @@ class HttpClient {
 	bool acceptGzip = true; ///
 
 	/// Automatically follow a redirection?
-	bool followLocation = false; ///
+	bool followLocation = false; /// NOT IMPLEMENTED
 
 	///
 	@property Uri location() {
diff --git a/minigui.d b/minigui.d
index dd297f8..c827192 100644
--- a/minigui.d
+++ b/minigui.d
@@ -1,5 +1,7 @@
 // http://msdn.microsoft.com/en-us/library/windows/desktop/bb775498%28v=vs.85%29.aspx
 
+// FIXME: a scroll area event signaling when a thing comes into view might be good
+
 // FIXME: unify Windows style line endings
 
 /*
diff --git a/minigui_xml.d b/minigui_xml.d
index cbef980..b3ef8ef 100644
--- a/minigui_xml.d
+++ b/minigui_xml.d
@@ -1,5 +1,5 @@
 /++
-	A small extension module to [arsd.minigu] that adds
+	A small extension module to [arsd.minigui] that adds
 	functions for creating widgets and windows from short
 	XML descriptions.
 
diff --git a/terminal.d b/terminal.d
index f69ecb4..945dd21 100644
--- a/terminal.d
+++ b/terminal.d
@@ -2295,7 +2295,7 @@ struct RealTimeConsoleInput {
 
 					auto cap = terminal.findSequenceInTermcap(thing);
 					if(cap is null) {
-						return charPressAndRelease('\033') ~
+						return keyPressAndRelease(NonCharacterKeyEvent.Key.escape) ~
 							charPressAndRelease('O') ~
 							charPressAndRelease(thing[2]);
 					} else {
@@ -2303,7 +2303,7 @@ struct RealTimeConsoleInput {
 					}
 				} else {
 					// I don't know, probably unsupported terminal or just quick user input or something
-					return charPressAndRelease('\033') ~ charPressAndRelease(nextChar(c));
+					return keyPressAndRelease(NonCharacterKeyEvent.Key.escape) ~ charPressAndRelease(nextChar(c));
 				}
 			} else {
 				// user hit escape (or super slow escape sequence, but meh)