diff --git a/src/cdrom/cdrom.c b/src/cdrom/cdrom.c
index 891606606..4b4e74d55 100644
--- a/src/cdrom/cdrom.c
+++ b/src/cdrom/cdrom.c
@@ -512,35 +512,54 @@ cdrom_get_current_subcodeq_playstatus(cdrom_t *dev, uint8_t *b)
     return ret;
 }
 
+
 static int
 read_toc_normal(cdrom_t *dev, unsigned char *b, unsigned char start_track, int msf)
 {
     track_info_t ti;
-    int len = 4;
-    int c, d, first_track, last_track;
+    int i, len = 4;
+    int first_track, last_track;
     uint32_t temp;
 
+    cdrom_log("read_toc_normal(%08X, %08X, %02X, %i)\n", dev, b, start_track, msf);
+
     dev->ops->get_tracks(dev, &first_track, &last_track);
 
-    b[2] = first_track;
-    b[3] = last_track;
+    /* Byte 2 = Number of the first track */
+    dev->ops->get_track_info(dev, 1, 0, &ti);
+    b[2] = ti.number;
+    cdrom_log("    b[2] = %02X\n", b[2]);
 
-    d = 0;
-    for (c = 0; c <= last_track; c++) {
-	dev->ops->get_track_info(dev, c + 1, 0, &ti);
-	if (ti.number >= start_track) {
-		d = c;
-		break;
+    /* Byte 3 = Number of the last track before the lead-out track */
+    dev->ops->get_track_info(dev, last_track, 0, &ti);
+    b[3] = ti.number;
+    cdrom_log("    b[3] = %02X\n", b[2]);
+
+    if (start_track == 0x00)
+	first_track = 0;
+    else {
+	first_track = -1;
+	for (i = 0; i <= last_track; i++) {
+		dev->ops->get_track_info(dev, i + 1, 0, &ti);
+		if (ti.number >= start_track) {
+			first_track = i;
+			break;
+		}
 	}
     }
+    cdrom_log("    first_track = %i, last_track = %i\n", first_track, last_track);
 
-    if (start_track != 0xAA) {
-	dev->ops->get_track_info(dev, c + 1, 0, &ti);
-	b[2] = ti.number;
+    /* No suitable starting track, return with error. */
+    if (first_track == -1) {
+#ifdef ENABLE_CDROM_LOG
+	cdrom_log("    [ERROR] No suitable track found\n");
+#endif
+	return -1;
     }
 
-    for (c = d; c <= last_track; c++) {
-	dev->ops->get_track_info(dev, c + 1, 0, &ti);
+    for (i = first_track; i <= last_track; i++) {
+	cdrom_log("    tracks(%i) = %02X, %02X, %i:%02i.%02i\n", i, ti.attr, ti.number, ti.m, ti.s, ti.f);
+	dev->ops->get_track_info(dev, i + 1, 0, &ti);
 
 	b[len++] = 0; /* reserved */
 	b[len++] = ti.attr;
@@ -572,23 +591,27 @@ read_toc_session(cdrom_t *dev, unsigned char *b, int msf)
     int len = 4;
     uint32_t temp;
 
+    cdrom_log("read_toc_session(%08X, %08X, %i)\n", dev, b, msf);
+
+    /* Bytes 2 and 3 = Number of first and last sessions */
+    b[2] = b[3] = 1;
+
     dev->ops->get_track_info(dev, 1, 0, &ti);
 
-    if (ti.number == 0)
-	ti.number = 1;
+    cdrom_log("    tracks(0) = %02X, %02X, %i:%02i.%02i\n", ti.attr, ti.number, ti.m, ti.s, ti.f);
 
-    b[2] = b[3] = 1;
     b[len++] = 0; /* reserved */
     b[len++] = ti.attr;
     b[len++] = ti.number; /* track number */
     b[len++] = 0; /* reserved */
+
     if (msf) {
 	b[len++] = 0;
 	b[len++] = ti.m;
 	b[len++] = ti.s;
 	b[len++] = ti.f;
     } else {
-	temp = MSFtoLBA(ti.m, ti.s, ti.f) - 150;	/* Do the - 150. */
+	temp = MSFtoLBA(ti.m, ti.s, ti.f) - 150;
 	b[len++] = temp >> 24;
 	b[len++] = temp >> 16;
 	b[len++] = temp >> 8;
@@ -603,28 +626,31 @@ static int
 read_toc_raw(cdrom_t *dev, unsigned char *b)
 {
     track_info_t ti;
+    int i, len = 4;
     int first_track, last_track;
-    int track, len = 4;
+
+    cdrom_log("read_toc_raw(%08X, %08X)\n", dev, b);
 
     dev->ops->get_tracks(dev, &first_track, &last_track);
 
-    b[2] = first_track;
-    b[3] = last_track;
+    /* Bytes 2 and 3 = Number of first and last sessions */
+    b[2] = b[3] = 1;
 
-    for (track = first_track; track <= last_track; track++) {
-	dev->ops->get_track_info(dev, track, 0, &ti);
+    for (i = 0; i <= last_track; i++) {
+	dev->ops->get_track_info(dev, i + 1, 0, &ti);
 
-	b[len++] = track;
-	b[len++] = ti.attr;
+	cdrom_log("    tracks(%i) = %02X, %02X, %i:%02i.%02i\n", i, ti.attr, ti.number, ti.m, ti.s, ti.f);
+
+	b[len++] = 1;		/* Session number */
+	b[len++] = ti.attr;	/* Track ADR and Control */
+	b[len++] = 0;		/* TNO (always 0) */
+	b[len++] = ti.number;	/* Point (for track points - track number) */
+	b[len++] = ti.m;	/* M */
+	b[len++] = ti.s;	/* S */
+	b[len++] = ti.f;	/* F */
 	b[len++] = 0;
 	b[len++] = 0;
 	b[len++] = 0;
-	b[len++] = 0;
-	b[len++] = 0;
-	b[len++] = 0;
-	b[len++] = ti.m;
-	b[len++] = ti.s;
-	b[len++] = ti.f;
     }
 
     return len;
diff --git a/src/cdrom/cdrom_image_backend.c b/src/cdrom/cdrom_image_backend.c
index 802069978..4552ddc00 100644
--- a/src/cdrom/cdrom_image_backend.c
+++ b/src/cdrom/cdrom_image_backend.c
@@ -262,6 +262,7 @@ cdi_get_audio_tracks(cd_img_t *cdi, int *st_track, int *end, TMSF *lead_out)
 }
 
 
+/* TODO: This never returns anything other than 1, should it even be an int? */
 int
 cdi_get_audio_tracks_lba(cd_img_t *cdi, int *st_track, int *end, uint32_t *lead_out)
 {
@@ -972,8 +973,7 @@ cdi_load_cue(cd_img_t *cdi, const wchar_t *cuefile)
 		success = 1;
 	} else {
 #ifdef ENABLE_CDROM_IMAGE_BACKEND_LOG
-		cdrom_image_backend_log("CUE: unsupported command '%s' in cue sheet!\n",
-				 command.c_str());
+		cdrom_image_backend_log("CUE: unsupported command '%s' in cue sheet!\n", command);
 #endif
 		success = 0;
 	}
diff --git a/src/cpu/386_common.c b/src/cpu/386_common.c
index 63ed7631a..e09d9b76e 100644
--- a/src/cpu/386_common.c
+++ b/src/cpu/386_common.c
@@ -74,9 +74,10 @@ smram_t temp_smram[2];
 /* SMM feature masks */
 #define SMM_IO_INSTRUCTION_RESTART  (0x00010000)
 #define SMM_SMBASE_RELOCATION       (0x00020000)
+#define SMM_REVISION		    (0x20000000)
 
 /* TODO: Which CPU added SMBASE relocation? */
-#define SMM_REVISION_ID SMM_SMBASE_RELOCATION
+#define SMM_REVISION_ID (SMM_SMBASE_RELOCATION | SMM_IO_INSTRUCTION_RESTART | SMM_REVISION)
 
 #define SMM_SAVE_STATE_MAP_SIZE 128
 
@@ -989,7 +990,7 @@ enter_smm(int in_hlt)
     uint32_t smram_state = smbase + 0x10000;
 
     /* If it's a CPU on which SMM is not supporter, do nothing. */
-    if (!is_pentium && !is_k5 && !is_k6 && !is_p6)
+    if (!is_am486 && !is_pentium && !is_k5 && !is_k6 && !is_p6)
 	return;
 
     x386_common_log("enter_smm(): smbase = %08X\n", smbase);
@@ -1146,7 +1147,7 @@ leave_smm(void)
     uint32_t smram_state = smbase + 0x10000;
 
     /* If it's a CPU on which SMM is not supported (or not implemented in 86Box), do nothing. */
-    if (!is_pentium && !is_k5 && !is_k6 && !is_p6)
+    if (!is_am486 && !is_pentium && !is_k5 && !is_k6 && !is_p6)
 	return;
 
     memset(saved_state, 0x00, SMM_SAVE_STATE_MAP_SIZE * sizeof(uint32_t));
diff --git a/src/cpu/808x.c b/src/cpu/808x.c
index 2cde6d9c5..f64f6ce8c 100644
--- a/src/cpu/808x.c
+++ b/src/cpu/808x.c
@@ -980,7 +980,7 @@ reset_common(int hard)
     smi_block = 0;
 
     if (hard) {
-	smbase = 0x00030000;
+	smbase = is_am486 ? 0x00060000 : 0x00030000;
 	ppi_reset();
     }
     in_sys = 0;
diff --git a/src/disk/mo.c b/src/disk/mo.c
index feefe881b..18f90c841 100644
--- a/src/disk/mo.c
+++ b/src/disk/mo.c
@@ -346,7 +346,8 @@ image_is_mdi(const wchar_t *s)
 int
 mo_load(mo_t *dev, wchar_t *fn)
 {
-    int is_mdi, size = 0;
+    int is_mdi;
+    uint32_t size = 0;
     unsigned int i, found = 0;
 
     is_mdi = image_is_mdi(fn);
@@ -364,11 +365,11 @@ mo_load(mo_t *dev, wchar_t *fn)
     }
 
     fseek(dev->drv->f, 0, SEEK_END);
-    size = ftell(dev->drv->f);
+    size = (uint32_t) ftello64(dev->drv->f);
 
     if (is_mdi) {
 	/* This is a MDI image. */
-	size -= 0x1000;
+	size -= 0x1000LL;
 	dev->drv->base = 0x1000;
     }
 
@@ -1037,14 +1038,14 @@ mo_insert(mo_t *dev)
 void
 mo_format(mo_t *dev)
 {
-    long size;
+    unsigned long size;
     int ret;
     int fd;
 
     mo_log("MO %i: Formatting media...\n", dev->id);
 
     fseek(dev->drv->f, 0, SEEK_END);
-    size = ftell(dev->drv->f);
+    size = (uint32_t) ftello64(dev->drv->f);
 
     HANDLE fh;
     LARGE_INTEGER liSize;
diff --git a/src/include/86box/resource.h b/src/include/86box/resource.h
index 450006ae4..b2c4810f6 100644
--- a/src/include/86box/resource.h
+++ b/src/include/86box/resource.h
@@ -315,6 +315,7 @@
 #define IDM_VID_GRAY_WHITE	40084
 
 #define IDM_MEDIA		40085
+#define IDM_DOCS		40086
 
 #ifdef USE_DISCORD
 #define IDM_DISCORD		40090
diff --git a/src/include/86box/version.h b/src/include/86box/version.h
index 7691bdab4..46deb8fe3 100644
--- a/src/include/86box/version.h
+++ b/src/include/86box/version.h
@@ -26,4 +26,5 @@
 
 /* Web URL info. */
 #define EMU_SITE	L"86box.net"
-#define EMU_ROMS_URL	L"https://github.com/86Box/roms/releases/latest"
\ No newline at end of file
+#define EMU_ROMS_URL	L"https://github.com/86Box/roms/releases/latest"
+#define EMU_DOCS_URL	L"https://86box.readthedocs.io"
diff --git a/src/scsi/scsi_cdrom.c b/src/scsi/scsi_cdrom.c
index f8a7e96fa..bf0c975f4 100644
--- a/src/scsi/scsi_cdrom.c
+++ b/src/scsi/scsi_cdrom.c
@@ -1534,9 +1534,15 @@ scsi_cdrom_command(scsi_common_t *sc, uint8_t *cdb)
 			return;
 		}
 
-		if (toc_format < 3)
+		if (toc_format < 3) {
 			len = cdrom_read_toc(dev->drv, dev->buffer, toc_format, cdb[6], msf, max_len);
-		else {
+			if (len == -1) {
+				/* If the returned length is -1, this means cdrom_read_toc() has encountered an error. */
+				scsi_cdrom_invalid_field(dev);
+				scsi_cdrom_buf_free(dev);
+				return;
+			}
+		} else {
 			scsi_cdrom_invalid_field(dev);
 			scsi_cdrom_buf_free(dev);
 			return;
diff --git a/src/video/vid_ega.c b/src/video/vid_ega.c
index b740f11f0..b077d2d12 100644
--- a/src/video/vid_ega.c
+++ b/src/video/vid_ega.c
@@ -673,7 +673,7 @@ ega_doblit(int y1, int y2, int wx, int wy, ega_t *ega)
     if (ys_temp < 32)
 	ys_temp = 200;
 
-    if ((xs_temp != xsize) || (ys_temp != ysize) || video_force_resize_get()) {
+    if ((ega->crtc[0x17] & 0x80) && ((xs_temp != xsize) || (ys_temp != ysize) || video_force_resize_get())) {
 	/* Screen res has changed.. fix up, and let them know. */
 	xsize = xs_temp;
 	ysize = ys_temp;
diff --git a/src/video/vid_ega_render.c b/src/video/vid_ega_render.c
index 0ab9b5b3f..9ea2a7bd3 100644
--- a/src/video/vid_ega_render.c
+++ b/src/video/vid_ega_render.c
@@ -127,8 +127,12 @@ ega_render_text_40(ega_t *ega)
 
 	for (x = 0; x < (ega->hdisp + ega->scrollcache); x += xinc) {
 		drawcursor = ((ega->ma == ega->ca) && ega->con && ega->cursoron);
-		chr  = ega->vram[(ega->ma << 1) & ega->vrammask];
-		attr = ega->vram[((ega->ma << 1) + 1) & ega->vrammask];
+
+		if (ega->crtc[0x17] & 0x80) {
+			chr  = ega->vram[(ega->ma << 1) & ega->vrammask];
+			attr = ega->vram[((ega->ma << 1) + 1) & ega->vrammask];
+		} else
+			chr = attr = 0;
 
 		if (attr & 8)	charaddr = ega->charsetb + (chr * 128);
 		else		charaddr = ega->charseta + (chr * 128);
@@ -190,8 +194,12 @@ ega_render_text_80(ega_t *ega)
 
 	for (x = 0; x < (ega->hdisp + ega->scrollcache); x += xinc) {
 		drawcursor = ((ega->ma == ega->ca) && ega->con && ega->cursoron);
-		chr  = ega->vram[(ega->ma << 1) & ega->vrammask];
-		attr = ega->vram[((ega->ma << 1) + 1) & ega->vrammask];
+
+		if (ega->crtc[0x17] & 0x80) {
+			chr  = ega->vram[(ega->ma << 1) & ega->vrammask];
+			attr = ega->vram[((ega->ma << 1) + 1) & ega->vrammask];
+		} else
+			chr = attr = 0;
 
 		if (attr & 8)	charaddr = ega->charsetb + (chr * 128);
 		else		charaddr = ega->charseta + (chr * 128);
@@ -274,14 +282,17 @@ ega_render_2bpp_lowres(ega_t *ega)
 
 	ega->ma &= ega->vrammask;
 
-	p[0]  = p[1]  = ega->pallook[ega->egapal[(dat[0] >> 6) & 3]];
-	p[2]  = p[3]  = ega->pallook[ega->egapal[(dat[0] >> 4) & 3]];
-	p[4]  = p[5]  = ega->pallook[ega->egapal[(dat[0] >> 2) & 3]];
-	p[6]  = p[7]  = ega->pallook[ega->egapal[dat[0] & 3]];
-	p[8]  = p[9]  = ega->pallook[ega->egapal[(dat[1] >> 6) & 3]];
-	p[10] = p[11] = ega->pallook[ega->egapal[(dat[1] >> 4) & 3]];
-	p[12] = p[13] = ega->pallook[ega->egapal[(dat[1] >> 2) & 3]];
-	p[14] = p[15] = ega->pallook[ega->egapal[dat[1] & 3]];
+	if (ega->crtc[0x17] & 0x80) {
+		p[0]  = p[1]  = ega->pallook[ega->egapal[(dat[0] >> 6) & 3]];
+		p[2]  = p[3]  = ega->pallook[ega->egapal[(dat[0] >> 4) & 3]];
+		p[4]  = p[5]  = ega->pallook[ega->egapal[(dat[0] >> 2) & 3]];
+		p[6]  = p[7]  = ega->pallook[ega->egapal[dat[0] & 3]];
+		p[8]  = p[9]  = ega->pallook[ega->egapal[(dat[1] >> 6) & 3]];
+		p[10] = p[11] = ega->pallook[ega->egapal[(dat[1] >> 4) & 3]];
+		p[12] = p[13] = ega->pallook[ega->egapal[(dat[1] >> 2) & 3]];
+		p[14] = p[15] = ega->pallook[ega->egapal[dat[1] & 3]];
+	} else
+		memset(p, 0x00, 16 * sizeof(uint32_t));
 
 	p += 16;
     }
@@ -333,14 +344,17 @@ ega_render_2bpp_highres(ega_t *ega)
 
 	ega->ma &= ega->vrammask;
 
-	p[0]  = ega->pallook[ega->egapal[(dat[0] >> 6) & 3]];
-	p[1]  = ega->pallook[ega->egapal[(dat[0] >> 4) & 3]];
-	p[2]  = ega->pallook[ega->egapal[(dat[0] >> 2) & 3]];
-	p[3]  = ega->pallook[ega->egapal[dat[0] & 3]];
-	p[4]  = ega->pallook[ega->egapal[(dat[1] >> 6) & 3]];
-	p[5] = ega->pallook[ega->egapal[(dat[1] >> 4) & 3]];
-	p[6] = ega->pallook[ega->egapal[(dat[1] >> 2) & 3]];
-	p[7] = ega->pallook[ega->egapal[dat[1] & 3]];
+	if (ega->crtc[0x17] & 0x80) {
+		p[0]  = ega->pallook[ega->egapal[(dat[0] >> 6) & 3]];
+		p[1]  = ega->pallook[ega->egapal[(dat[0] >> 4) & 3]];
+		p[2]  = ega->pallook[ega->egapal[(dat[0] >> 2) & 3]];
+		p[3]  = ega->pallook[ega->egapal[dat[0] & 3]];
+		p[4]  = ega->pallook[ega->egapal[(dat[1] >> 6) & 3]];
+		p[5] = ega->pallook[ega->egapal[(dat[1] >> 4) & 3]];
+		p[6] = ega->pallook[ega->egapal[(dat[1] >> 2) & 3]];
+		p[7] = ega->pallook[ega->egapal[dat[1] & 3]];
+	} else
+		memset(p, 0x00, 8 * sizeof(uint32_t));
 
 	p += 8;
     }
@@ -402,18 +416,21 @@ ega_render_4bpp_lowres(ega_t *ega)
 
 	ega->ma &= ega->vrammask;
 
-	dat = edatlookup[edat[0] >> 6][edat[1] >> 6] | (edatlookup[edat[2] >> 6][edat[3] >> 6] << 2);
-	p[0]  = p[1]  = ega->pallook[ega->egapal[(dat >> 4) & ega->plane_mask]];
-	p[2]  = p[3]  = ega->pallook[ega->egapal[dat & ega->plane_mask]];
-	dat = edatlookup[(edat[0] >> 4) & 3][(edat[1] >> 4) & 3] | (edatlookup[(edat[2] >> 4) & 3][(edat[3] >> 4) & 3] << 2);
-	p[4]  = p[5]  = ega->pallook[ega->egapal[(dat >> 4) & ega->plane_mask]];
-	p[6]  = p[7]  = ega->pallook[ega->egapal[dat & ega->plane_mask]];
-	dat = edatlookup[(edat[0] >> 2) & 3][(edat[1] >> 2) & 3] | (edatlookup[(edat[2] >> 2) & 3][(edat[3] >> 2) & 3] << 2);
-	p[8]  = p[9]  = ega->pallook[ega->egapal[(dat >> 4) & ega->plane_mask]];
-	p[10] = p[11] = ega->pallook[ega->egapal[dat & ega->plane_mask]];
-	dat = edatlookup[edat[0] & 3][edat[1] & 3] | (edatlookup[edat[2] & 3][edat[3] & 3] << 2);
-	p[12] = p[13] = ega->pallook[ega->egapal[(dat >> 4) & ega->plane_mask]];
-	p[14] = p[15] = ega->pallook[ega->egapal[dat & ega->plane_mask]];
+	if (ega->crtc[0x17] & 0x80) {
+		dat = edatlookup[edat[0] >> 6][edat[1] >> 6] | (edatlookup[edat[2] >> 6][edat[3] >> 6] << 2);
+		p[0]  = p[1]  = ega->pallook[ega->egapal[(dat >> 4) & ega->plane_mask]];
+		p[2]  = p[3]  = ega->pallook[ega->egapal[dat & ega->plane_mask]];
+		dat = edatlookup[(edat[0] >> 4) & 3][(edat[1] >> 4) & 3] | (edatlookup[(edat[2] >> 4) & 3][(edat[3] >> 4) & 3] << 2);
+		p[4]  = p[5]  = ega->pallook[ega->egapal[(dat >> 4) & ega->plane_mask]];
+		p[6]  = p[7]  = ega->pallook[ega->egapal[dat & ega->plane_mask]];
+		dat = edatlookup[(edat[0] >> 2) & 3][(edat[1] >> 2) & 3] | (edatlookup[(edat[2] >> 2) & 3][(edat[3] >> 2) & 3] << 2);
+		p[8]  = p[9]  = ega->pallook[ega->egapal[(dat >> 4) & ega->plane_mask]];
+		p[10] = p[11] = ega->pallook[ega->egapal[dat & ega->plane_mask]];
+		dat = edatlookup[edat[0] & 3][edat[1] & 3] | (edatlookup[edat[2] & 3][edat[3] & 3] << 2);
+		p[12] = p[13] = ega->pallook[ega->egapal[(dat >> 4) & ega->plane_mask]];
+		p[14] = p[15] = ega->pallook[ega->egapal[dat & ega->plane_mask]];
+	} else
+		memset(p, 0x00, 16 * sizeof(uint32_t));
 
 	p += 16;
     }
@@ -470,18 +487,21 @@ ega_render_4bpp_highres(ega_t *ega)
 	}
 	ega->ma &= ega->vrammask;
 
-	dat = edatlookup[edat[0] >> 6][edat[1] >> 6] | (edatlookup[edat[2] >> 6][edat[3] >> 6] << 2);
-	p[0] = ega->pallook[ega->egapal[(dat >> 4) & ega->plane_mask]];
-	p[1] = ega->pallook[ega->egapal[dat & ega->plane_mask]];
-	dat = edatlookup[(edat[0] >> 4) & 3][(edat[1] >> 4) & 3] | (edatlookup[(edat[2] >> 4) & 3][(edat[3] >> 4) & 3] << 2);
-	p[2] = ega->pallook[ega->egapal[(dat >> 4) & ega->plane_mask]];
-	p[3] = ega->pallook[ega->egapal[dat & ega->plane_mask]];
-	dat = edatlookup[(edat[0] >> 2) & 3][(edat[1] >> 2) & 3] | (edatlookup[(edat[2] >> 2) & 3][(edat[3] >> 2) & 3] << 2);
-	p[4] = ega->pallook[ega->egapal[(dat >> 4) & ega->plane_mask]];
-	p[5] = ega->pallook[ega->egapal[dat & ega->plane_mask]];
-	dat = edatlookup[edat[0] & 3][edat[1] & 3] | (edatlookup[edat[2] & 3][edat[3] & 3] << 2);
-	p[6] = ega->pallook[ega->egapal[(dat >> 4) & ega->plane_mask]];
-	p[7] = ega->pallook[ega->egapal[dat & ega->plane_mask]];
+	if (ega->crtc[0x17] & 0x80) {
+		dat = edatlookup[edat[0] >> 6][edat[1] >> 6] | (edatlookup[edat[2] >> 6][edat[3] >> 6] << 2);
+		p[0] = ega->pallook[ega->egapal[(dat >> 4) & ega->plane_mask]];
+		p[1] = ega->pallook[ega->egapal[dat & ega->plane_mask]];
+		dat = edatlookup[(edat[0] >> 4) & 3][(edat[1] >> 4) & 3] | (edatlookup[(edat[2] >> 4) & 3][(edat[3] >> 4) & 3] << 2);
+		p[2] = ega->pallook[ega->egapal[(dat >> 4) & ega->plane_mask]];
+		p[3] = ega->pallook[ega->egapal[dat & ega->plane_mask]];
+		dat = edatlookup[(edat[0] >> 2) & 3][(edat[1] >> 2) & 3] | (edatlookup[(edat[2] >> 2) & 3][(edat[3] >> 2) & 3] << 2);
+		p[4] = ega->pallook[ega->egapal[(dat >> 4) & ega->plane_mask]];
+		p[5] = ega->pallook[ega->egapal[dat & ega->plane_mask]];
+		dat = edatlookup[edat[0] & 3][edat[1] & 3] | (edatlookup[edat[2] & 3][edat[3] & 3] << 2);
+		p[6] = ega->pallook[ega->egapal[(dat >> 4) & ega->plane_mask]];
+		p[7] = ega->pallook[ega->egapal[dat & ega->plane_mask]];
+	} else
+		memset(p, 0x00, 8 * sizeof(uint32_t));
 
 	p += 8;
     }
diff --git a/src/video/vid_svga.c b/src/video/vid_svga.c
index aedaf58a9..3bec9dd24 100644
--- a/src/video/vid_svga.c
+++ b/src/video/vid_svga.c
@@ -1299,7 +1299,7 @@ svga_doblit(int y1, int y2, int wx, int wy, svga_t *svga)
     if (ys_temp < 32)
 	ys_temp = 200;
 
-    if ((xs_temp != xsize) || (ys_temp != ysize) || video_force_resize_get()) {
+    if ((svga->crtc[0x17] & 0x80) && ((xs_temp != xsize) || (ys_temp != ysize) || video_force_resize_get())) {
 	/* Screen res has changed.. fix up, and let them know. */
 	xsize = xs_temp;
 	ysize = ys_temp;
diff --git a/src/video/vid_svga_render.c b/src/video/vid_svga_render.c
index c76bf2d72..00fa85ff9 100644
--- a/src/video/vid_svga_render.c
+++ b/src/video/vid_svga_render.c
@@ -120,8 +120,12 @@ svga_render_text_40(svga_t *svga)
 
 	for (x = 0; x < (svga->hdisp + svga->scrollcache); x += xinc) {
 		drawcursor = ((svga->ma == svga->ca) && svga->con && svga->cursoron);
-		chr  = svga->vram[(svga->ma << 1) & svga->vram_display_mask];
-		attr = svga->vram[((svga->ma << 1) + 1) & svga->vram_display_mask];
+
+		if (svga->crtc[0x17] & 0x80) {
+			chr  = svga->vram[(svga->ma << 1) & svga->vram_display_mask];
+			attr = svga->vram[((svga->ma << 1) + 1) & svga->vram_display_mask];
+		} else
+			chr = attr = 0;
 
 		if (attr & 8)	charaddr = svga->charsetb + (chr * 128);
 		else		charaddr = svga->charseta + (chr * 128);
@@ -183,8 +187,12 @@ svga_render_text_80(svga_t *svga)
 
 	for (x = 0; x < (svga->hdisp + svga->scrollcache); x += xinc) {
 		drawcursor = ((svga->ma == svga->ca) && svga->con && svga->cursoron);
-		chr  = svga->vram[(svga->ma << 1) & svga->vram_display_mask];
-		attr = svga->vram[((svga->ma << 1) + 1) & svga->vram_display_mask];
+
+		if (svga->crtc[0x17] & 0x80) {
+			chr  = svga->vram[(svga->ma << 1) & svga->vram_display_mask];
+			attr = svga->vram[((svga->ma << 1) + 1) & svga->vram_display_mask];
+		} else
+			chr = attr = 0;
 
 		if (attr & 8)	charaddr = svga->charsetb + (chr * 128);
 		else		charaddr = svga->charseta + (chr * 128);
@@ -248,7 +256,10 @@ svga_render_text_80_ksc5601(svga_t *svga)
 		drawcursor = ((svga->ma == svga->ca) && svga->con && svga->cursoron);
 		chr  = svga->vram[(svga->ma << 1) & svga->vram_display_mask];
 		nextchr = svga->vram[((svga->ma + 4) << 1) & svga->vram_display_mask];
-		attr = svga->vram[((svga->ma << 1) + 1) & svga->vram_display_mask];
+		if (svga->crtc[0x17] & 0x80)
+			attr = svga->vram[((svga->ma << 1) + 1) & svga->vram_display_mask];
+		else
+			attr = 0;
 
 		if (drawcursor) { 
 			bg = svga->pallook[svga->egapal[attr & 15]]; 
@@ -391,14 +402,17 @@ svga_render_2bpp_lowres(svga_t *svga)
 
 		svga->ma &= svga->vram_mask;
 
-		p[0]  = p[1]  = svga->pallook[svga->egapal[(dat[0] >> 6) & 3]];
-		p[2]  = p[3]  = svga->pallook[svga->egapal[(dat[0] >> 4) & 3]];
-		p[4]  = p[5]  = svga->pallook[svga->egapal[(dat[0] >> 2) & 3]];
-		p[6]  = p[7]  = svga->pallook[svga->egapal[dat[0] & 3]];
-		p[8]  = p[9]  = svga->pallook[svga->egapal[(dat[1] >> 6) & 3]];
-		p[10] = p[11] = svga->pallook[svga->egapal[(dat[1] >> 4) & 3]];
-		p[12] = p[13] = svga->pallook[svga->egapal[(dat[1] >> 2) & 3]];
-		p[14] = p[15] = svga->pallook[svga->egapal[dat[1] & 3]];
+		if (svga->crtc[0x17] & 0x80) {
+			p[0]  = p[1]  = svga->pallook[svga->egapal[(dat[0] >> 6) & 3]];
+			p[2]  = p[3]  = svga->pallook[svga->egapal[(dat[0] >> 4) & 3]];
+			p[4]  = p[5]  = svga->pallook[svga->egapal[(dat[0] >> 2) & 3]];
+			p[6]  = p[7]  = svga->pallook[svga->egapal[dat[0] & 3]];
+			p[8]  = p[9]  = svga->pallook[svga->egapal[(dat[1] >> 6) & 3]];
+			p[10] = p[11] = svga->pallook[svga->egapal[(dat[1] >> 4) & 3]];
+			p[12] = p[13] = svga->pallook[svga->egapal[(dat[1] >> 2) & 3]];
+			p[14] = p[15] = svga->pallook[svga->egapal[dat[1] & 3]];
+		} else
+			memset(p, 0x00, 16 * sizeof(uint32_t));
 
 		p += 16;
 	}
@@ -454,14 +468,17 @@ svga_render_2bpp_highres(svga_t *svga)
 
 		svga->ma &= svga->vram_mask;
 
-		p[0] = svga->pallook[svga->egapal[(dat[0] >> 6) & 3]];
-		p[1] = svga->pallook[svga->egapal[(dat[0] >> 4) & 3]];
-		p[2] = svga->pallook[svga->egapal[(dat[0] >> 2) & 3]];
-		p[3] = svga->pallook[svga->egapal[dat[0] & 3]];
-		p[4] = svga->pallook[svga->egapal[(dat[1] >> 6) & 3]];
-		p[5] = svga->pallook[svga->egapal[(dat[1] >> 4) & 3]];
-		p[6] = svga->pallook[svga->egapal[(dat[1] >> 2) & 3]];
-		p[7] = svga->pallook[svga->egapal[dat[1] & 3]];
+		if (svga->crtc[0x17] & 0x80) {
+			p[0] = svga->pallook[svga->egapal[(dat[0] >> 6) & 3]];
+			p[1] = svga->pallook[svga->egapal[(dat[0] >> 4) & 3]];
+			p[2] = svga->pallook[svga->egapal[(dat[0] >> 2) & 3]];
+			p[3] = svga->pallook[svga->egapal[dat[0] & 3]];
+			p[4] = svga->pallook[svga->egapal[(dat[1] >> 6) & 3]];
+			p[5] = svga->pallook[svga->egapal[(dat[1] >> 4) & 3]];
+			p[6] = svga->pallook[svga->egapal[(dat[1] >> 2) & 3]];
+			p[7] = svga->pallook[svga->egapal[dat[1] & 3]];
+		} else
+			memset(p, 0x00, 8 * sizeof(uint32_t));
 
 		p += 8;
 	}
@@ -521,18 +538,21 @@ svga_render_4bpp_lowres(svga_t *svga)
 		}
 		svga->ma &= svga->vram_mask;
 
-		dat = edatlookup[edat[0] >> 6][edat[1] >> 6] | (edatlookup[edat[2] >> 6][edat[3] >> 6] << 2);
-		p[0]  = p[1]  = svga->pallook[svga->egapal[(dat >> 4) & svga->plane_mask]];
-		p[2]  = p[3]  = svga->pallook[svga->egapal[dat & svga->plane_mask]];
-		dat = edatlookup[(edat[0] >> 4) & 3][(edat[1] >> 4) & 3] | (edatlookup[(edat[2] >> 4) & 3][(edat[3] >> 4) & 3] << 2);
-		p[4]  = p[5]  = svga->pallook[svga->egapal[(dat >> 4) & svga->plane_mask]];
-		p[6]  = p[7]  = svga->pallook[svga->egapal[dat & svga->plane_mask]];
-		dat = edatlookup[(edat[0] >> 2) & 3][(edat[1] >> 2) & 3] | (edatlookup[(edat[2] >> 2) & 3][(edat[3] >> 2) & 3] << 2);
-		p[8]  = p[9]  = svga->pallook[svga->egapal[(dat >> 4) & svga->plane_mask]];
-		p[10] = p[11] = svga->pallook[svga->egapal[dat & svga->plane_mask]];
-		dat = edatlookup[edat[0] & 3][edat[1] & 3] | (edatlookup[edat[2] & 3][edat[3] & 3] << 2);
-		p[12] = p[13] = svga->pallook[svga->egapal[(dat >> 4) & svga->plane_mask]];
-		p[14] = p[15] = svga->pallook[svga->egapal[dat & svga->plane_mask]];
+		if (svga->crtc[0x17] & 0x80) {
+			dat = edatlookup[edat[0] >> 6][edat[1] >> 6] | (edatlookup[edat[2] >> 6][edat[3] >> 6] << 2);
+			p[0]  = p[1]  = svga->pallook[svga->egapal[(dat >> 4) & svga->plane_mask]];
+			p[2]  = p[3]  = svga->pallook[svga->egapal[dat & svga->plane_mask]];
+			dat = edatlookup[(edat[0] >> 4) & 3][(edat[1] >> 4) & 3] | (edatlookup[(edat[2] >> 4) & 3][(edat[3] >> 4) & 3] << 2);
+			p[4]  = p[5]  = svga->pallook[svga->egapal[(dat >> 4) & svga->plane_mask]];
+			p[6]  = p[7]  = svga->pallook[svga->egapal[dat & svga->plane_mask]];
+			dat = edatlookup[(edat[0] >> 2) & 3][(edat[1] >> 2) & 3] | (edatlookup[(edat[2] >> 2) & 3][(edat[3] >> 2) & 3] << 2);
+			p[8]  = p[9]  = svga->pallook[svga->egapal[(dat >> 4) & svga->plane_mask]];
+			p[10] = p[11] = svga->pallook[svga->egapal[dat & svga->plane_mask]];
+			dat = edatlookup[edat[0] & 3][edat[1] & 3] | (edatlookup[edat[2] & 3][edat[3] & 3] << 2);
+			p[12] = p[13] = svga->pallook[svga->egapal[(dat >> 4) & svga->plane_mask]];
+			p[14] = p[15] = svga->pallook[svga->egapal[dat & svga->plane_mask]];
+		} else
+			memset(p, 0x00, 16 * sizeof(uint32_t));
 
 		p += 16;
 	}
@@ -595,18 +615,21 @@ svga_render_4bpp_highres(svga_t *svga)
 		}
 		svga->ma &= svga->vram_mask;
 
-		dat = edatlookup[edat[0] >> 6][edat[1] >> 6] | (edatlookup[edat[2] >> 6][edat[3] >> 6] << 2);
-		p[0] = svga->pallook[svga->egapal[(dat >> 4) & svga->plane_mask]];
-		p[1] = svga->pallook[svga->egapal[dat & svga->plane_mask]];
-		dat = edatlookup[(edat[0] >> 4) & 3][(edat[1] >> 4) & 3] | (edatlookup[(edat[2] >> 4) & 3][(edat[3] >> 4) & 3] << 2);
-		p[2] = svga->pallook[svga->egapal[(dat >> 4) & svga->plane_mask]];
-		p[3] = svga->pallook[svga->egapal[dat & svga->plane_mask]];
-		dat = edatlookup[(edat[0] >> 2) & 3][(edat[1] >> 2) & 3] | (edatlookup[(edat[2] >> 2) & 3][(edat[3] >> 2) & 3] << 2);
-		p[4] = svga->pallook[svga->egapal[(dat >> 4) & svga->plane_mask]];
-		p[5] = svga->pallook[svga->egapal[dat & svga->plane_mask]];
-		dat = edatlookup[edat[0] & 3][edat[1] & 3] | (edatlookup[edat[2] & 3][edat[3] & 3] << 2);
-		p[6] = svga->pallook[svga->egapal[(dat >> 4) & svga->plane_mask]];
-		p[7] = svga->pallook[svga->egapal[dat & svga->plane_mask]];
+		if (svga->crtc[0x17] & 0x80) {
+			dat = edatlookup[edat[0] >> 6][edat[1] >> 6] | (edatlookup[edat[2] >> 6][edat[3] >> 6] << 2);
+			p[0] = svga->pallook[svga->egapal[(dat >> 4) & svga->plane_mask]];
+			p[1] = svga->pallook[svga->egapal[dat & svga->plane_mask]];
+			dat = edatlookup[(edat[0] >> 4) & 3][(edat[1] >> 4) & 3] | (edatlookup[(edat[2] >> 4) & 3][(edat[3] >> 4) & 3] << 2);
+			p[2] = svga->pallook[svga->egapal[(dat >> 4) & svga->plane_mask]];
+			p[3] = svga->pallook[svga->egapal[dat & svga->plane_mask]];
+			dat = edatlookup[(edat[0] >> 2) & 3][(edat[1] >> 2) & 3] | (edatlookup[(edat[2] >> 2) & 3][(edat[3] >> 2) & 3] << 2);
+			p[4] = svga->pallook[svga->egapal[(dat >> 4) & svga->plane_mask]];
+			p[5] = svga->pallook[svga->egapal[dat & svga->plane_mask]];
+			dat = edatlookup[edat[0] & 3][edat[1] & 3] | (edatlookup[edat[2] & 3][edat[3] & 3] << 2);
+			p[6] = svga->pallook[svga->egapal[(dat >> 4) & svga->plane_mask]];
+			p[7] = svga->pallook[svga->egapal[dat & svga->plane_mask]];
+		} else
+			memset(p, 0x00, 8 * sizeof(uint32_t));
 
 		p += 8;
 	}
@@ -632,12 +655,14 @@ svga_render_8bpp_lowres(svga_t *svga)
 	svga->lastline_draw = svga->displine;
 
 	for (x = 0; x <= (svga->hdisp + svga->scrollcache); x += 8) {
-		dat = *(uint32_t *)(&svga->vram[svga->ma & svga->vram_display_mask]);
-
-		p[0] = p[1] = svga->map8[dat & 0xff];
-		p[2] = p[3] = svga->map8[(dat >> 8) & 0xff];
-		p[4] = p[5] = svga->map8[(dat >> 16) & 0xff];
-		p[6] = p[7] = svga->map8[(dat >> 24) & 0xff];
+		if (svga->crtc[0x17] & 0x80) {
+			dat = *(uint32_t *)(&svga->vram[svga->ma & svga->vram_display_mask]);
+			p[0] = p[1] = svga->map8[dat & 0xff];
+			p[2] = p[3] = svga->map8[(dat >> 8) & 0xff];
+			p[4] = p[5] = svga->map8[(dat >> 16) & 0xff];
+			p[6] = p[7] = svga->map8[(dat >> 24) & 0xff];
+		} else
+			memset(p, 0x00, 8 * sizeof(uint32_t));
 
 		svga->ma += 4;
 		p += 8;
@@ -665,17 +690,20 @@ svga_render_8bpp_highres(svga_t *svga)
 	svga->lastline_draw = svga->displine;
 
 	for (x = 0; x <= (svga->hdisp/* + svga->scrollcache*/); x += 8) {
-		dat = *(uint32_t *)(&svga->vram[svga->ma & svga->vram_display_mask]);
-		p[0] = svga->map8[dat & 0xff];
-		p[1] = svga->map8[(dat >> 8) & 0xff];
-		p[2] = svga->map8[(dat >> 16) & 0xff];
-		p[3] = svga->map8[(dat >> 24) & 0xff];
+		if (svga->crtc[0x17] & 0x80) {
+			dat = *(uint32_t *)(&svga->vram[svga->ma & svga->vram_display_mask]);
+			p[0] = svga->map8[dat & 0xff];
+			p[1] = svga->map8[(dat >> 8) & 0xff];
+			p[2] = svga->map8[(dat >> 16) & 0xff];
+			p[3] = svga->map8[(dat >> 24) & 0xff];
 
-		dat = *(uint32_t *)(&svga->vram[(svga->ma + 4) & svga->vram_display_mask]);
-		p[4] = svga->map8[dat & 0xff];
-		p[5] = svga->map8[(dat >> 8) & 0xff];
-		p[6] = svga->map8[(dat >> 16) & 0xff];
-		p[7] = svga->map8[(dat >> 24) & 0xff];
+			dat = *(uint32_t *)(&svga->vram[(svga->ma + 4) & svga->vram_display_mask]);
+			p[4] = svga->map8[dat & 0xff];
+			p[5] = svga->map8[(dat >> 8) & 0xff];
+			p[6] = svga->map8[(dat >> 16) & 0xff];
+			p[7] = svga->map8[(dat >> 24) & 0xff];
+		} else
+			memset(p, 0x00, 8 * sizeof(uint32_t));
 
 		svga->ma += 8;
 		p += 8;
@@ -703,17 +731,18 @@ svga_render_15bpp_lowres(svga_t *svga)
 	svga->lastline_draw = svga->displine;
 
 	for (x = 0; x <= (svga->hdisp + svga->scrollcache); x += 4) {
-		dat = *(uint32_t *)(&svga->vram[(svga->ma + (x << 1)) & svga->vram_display_mask]);
+		if (svga->crtc[0x17] & 0x80) {
+			dat = *(uint32_t *)(&svga->vram[(svga->ma + (x << 1)) & svga->vram_display_mask]);
 
-		p[(x << 1)]     = p[(x << 1) + 1] = video_15to32[dat & 0xffff];
+			p[(x << 1)]     = p[(x << 1) + 1] = video_15to32[dat & 0xffff];
+			p[(x << 1) + 2] = p[(x << 1) + 3] = video_15to32[dat >> 16];
 
-		p[(x << 1) + 2] = p[(x << 1) + 3] = video_15to32[dat >> 16];
+			dat = *(uint32_t *)(&svga->vram[(svga->ma + (x << 1) + 4) & svga->vram_display_mask]);
 
-		dat = *(uint32_t *)(&svga->vram[(svga->ma + (x << 1) + 4) & svga->vram_display_mask]);
-
-		p[(x << 1) + 4] = p[(x << 1) + 5] = video_15to32[dat & 0xffff];
-
-		p[(x << 1) + 6] = p[(x << 1) + 7] = video_15to32[dat >> 16];
+			p[(x << 1) + 4] = p[(x << 1) + 5] = video_15to32[dat & 0xffff];
+			p[(x << 1) + 6] = p[(x << 1) + 7] = video_15to32[dat >> 16];
+		} else
+			memset(&(p[(x << 1)]), 0x00, 8 * sizeof(uint32_t));
 	}
 	svga->ma += x << 1;
 	svga->ma &= svga->vram_display_mask;
@@ -739,21 +768,24 @@ svga_render_15bpp_highres(svga_t *svga)
 	svga->lastline_draw = svga->displine;
 
 	for (x = 0; x <= (svga->hdisp + svga->scrollcache); x += 8) {
-		dat = *(uint32_t *)(&svga->vram[(svga->ma + (x << 1)) & svga->vram_display_mask]);
-		p[x]     = video_15to32[dat & 0xffff];
-		p[x + 1] = video_15to32[dat >> 16];
+		if (svga->crtc[0x17] & 0x80) {
+			dat = *(uint32_t *)(&svga->vram[(svga->ma + (x << 1)) & svga->vram_display_mask]);
+			p[x]     = video_15to32[dat & 0xffff];
+			p[x + 1] = video_15to32[dat >> 16];
 
-		dat = *(uint32_t *)(&svga->vram[(svga->ma + (x << 1) + 4) & svga->vram_display_mask]);
-		p[x + 2] = video_15to32[dat & 0xffff];
-		p[x + 3] = video_15to32[dat >> 16];
+			dat = *(uint32_t *)(&svga->vram[(svga->ma + (x << 1) + 4) & svga->vram_display_mask]);
+			p[x + 2] = video_15to32[dat & 0xffff];
+			p[x + 3] = video_15to32[dat >> 16];
 
-		dat = *(uint32_t *)(&svga->vram[(svga->ma + (x << 1) + 8) & svga->vram_display_mask]);
-		p[x + 4] = video_15to32[dat & 0xffff];
-		p[x + 5] = video_15to32[dat >> 16];
+			dat = *(uint32_t *)(&svga->vram[(svga->ma + (x << 1) + 8) & svga->vram_display_mask]);
+			p[x + 4] = video_15to32[dat & 0xffff];
+			p[x + 5] = video_15to32[dat >> 16];
 
-		dat = *(uint32_t *)(&svga->vram[(svga->ma + (x << 1) + 12) & svga->vram_display_mask]);
-		p[x + 6] = video_15to32[dat & 0xffff];
-		p[x + 7] = video_15to32[dat >> 16];
+			dat = *(uint32_t *)(&svga->vram[(svga->ma + (x << 1) + 12) & svga->vram_display_mask]);
+			p[x + 6] = video_15to32[dat & 0xffff];
+			p[x + 7] = video_15to32[dat >> 16];
+		} else
+			memset(&(p[x]), 0x00, 8 * sizeof(uint32_t));
 	}
 	svga->ma += x << 1; 
 	svga->ma &= svga->vram_display_mask;
@@ -779,17 +811,20 @@ svga_render_15bpp_mix_lowres(svga_t *svga)
 	svga->lastline_draw = svga->displine;
 
 	for (x = 0; x <= (svga->hdisp + svga->scrollcache); x += 4) {
-		dat = *(uint32_t *)(&svga->vram[(svga->ma + (x << 1)) & svga->vram_display_mask]);
-		p[(x << 1)]     = p[(x << 1) + 1] = (dat & 0x00008000) ? svga->pallook[dat & 0xff] : video_15to32[dat & 0xffff];
+		if (svga->crtc[0x17] & 0x80) {
+			dat = *(uint32_t *)(&svga->vram[(svga->ma + (x << 1)) & svga->vram_display_mask]);
+			p[(x << 1)]     = p[(x << 1) + 1] = (dat & 0x00008000) ? svga->pallook[dat & 0xff] : video_15to32[dat & 0xffff];
 
-		dat >>= 16;
-		p[(x << 1) + 2] = p[(x << 1) + 3] = (dat & 0x00008000) ? svga->pallook[dat & 0xff] : video_15to32[dat & 0xffff];
+			dat >>= 16;
+			p[(x << 1) + 2] = p[(x << 1) + 3] = (dat & 0x00008000) ? svga->pallook[dat & 0xff] : video_15to32[dat & 0xffff];
 
-		dat = *(uint32_t *)(&svga->vram[(svga->ma + (x << 1) + 4) & svga->vram_display_mask]);
-		p[(x << 1) + 4] = p[(x << 1) + 5] = (dat & 0x00008000) ? svga->pallook[dat & 0xff] : video_15to32[dat & 0xffff];
+			dat = *(uint32_t *)(&svga->vram[(svga->ma + (x << 1) + 4) & svga->vram_display_mask]);
+			p[(x << 1) + 4] = p[(x << 1) + 5] = (dat & 0x00008000) ? svga->pallook[dat & 0xff] : video_15to32[dat & 0xffff];
 
-		dat >>= 16;
-		p[(x << 1) + 6] = p[(x << 1) + 7] = (dat & 0x00008000) ? svga->pallook[dat & 0xff] : video_15to32[dat & 0xffff];
+			dat >>= 16;
+			p[(x << 1) + 6] = p[(x << 1) + 7] = (dat & 0x00008000) ? svga->pallook[dat & 0xff] : video_15to32[dat & 0xffff];
+		} else
+			memset(&(p[(x << 1)]), 0x00, 8 * sizeof(uint32_t));
 	}
 	svga->ma += x << 1;
 	svga->ma &= svga->vram_display_mask;
@@ -815,25 +850,28 @@ svga_render_15bpp_mix_highres(svga_t *svga)
 	svga->lastline_draw = svga->displine;
 
 	for (x = 0; x <= (svga->hdisp + svga->scrollcache); x += 8) {
-		dat = *(uint32_t *)(&svga->vram[(svga->ma + (x << 1)) & svga->vram_display_mask]);
-		p[x]     = (dat & 0x00008000) ? svga->pallook[dat & 0xff] : video_15to32[dat & 0xffff];
-		dat >>= 16;
-		p[x + 1] = (dat & 0x00008000) ? svga->pallook[dat & 0xff] : video_15to32[dat & 0xffff];
+		if (svga->crtc[0x17] & 0x80) {
+			dat = *(uint32_t *)(&svga->vram[(svga->ma + (x << 1)) & svga->vram_display_mask]);
+			p[x]     = (dat & 0x00008000) ? svga->pallook[dat & 0xff] : video_15to32[dat & 0xffff];
+			dat >>= 16;
+			p[x + 1] = (dat & 0x00008000) ? svga->pallook[dat & 0xff] : video_15to32[dat & 0xffff];
 
-		dat = *(uint32_t *)(&svga->vram[(svga->ma + (x << 1) + 4) & svga->vram_display_mask]);
-		p[x + 2] = (dat & 0x00008000) ? svga->pallook[dat & 0xff] : video_15to32[dat & 0xffff];
-		dat >>= 16;
-		p[x + 3] = (dat & 0x00008000) ? svga->pallook[dat & 0xff] : video_15to32[dat & 0xffff];
+			dat = *(uint32_t *)(&svga->vram[(svga->ma + (x << 1) + 4) & svga->vram_display_mask]);
+			p[x + 2] = (dat & 0x00008000) ? svga->pallook[dat & 0xff] : video_15to32[dat & 0xffff];
+			dat >>= 16;
+			p[x + 3] = (dat & 0x00008000) ? svga->pallook[dat & 0xff] : video_15to32[dat & 0xffff];
 
-		dat = *(uint32_t *)(&svga->vram[(svga->ma + (x << 1) + 8) & svga->vram_display_mask]);
-		p[x + 4] = (dat & 0x00008000) ? svga->pallook[dat & 0xff] : video_15to32[dat & 0xffff];
-		dat >>= 16;
-		p[x + 5] = (dat & 0x00008000) ? svga->pallook[dat & 0xff] : video_15to32[dat & 0xffff];
+			dat = *(uint32_t *)(&svga->vram[(svga->ma + (x << 1) + 8) & svga->vram_display_mask]);
+			p[x + 4] = (dat & 0x00008000) ? svga->pallook[dat & 0xff] : video_15to32[dat & 0xffff];
+			dat >>= 16;
+			p[x + 5] = (dat & 0x00008000) ? svga->pallook[dat & 0xff] : video_15to32[dat & 0xffff];
 
-		dat = *(uint32_t *)(&svga->vram[(svga->ma + (x << 1) + 12) & svga->vram_display_mask]);
-		p[x + 6] = (dat & 0x00008000) ? svga->pallook[dat & 0xff] : video_15to32[dat & 0xffff];
-		dat >>= 16;
-		p[x + 7] = (dat & 0x00008000) ? svga->pallook[dat & 0xff] : video_15to32[dat & 0xffff];
+			dat = *(uint32_t *)(&svga->vram[(svga->ma + (x << 1) + 12) & svga->vram_display_mask]);
+			p[x + 6] = (dat & 0x00008000) ? svga->pallook[dat & 0xff] : video_15to32[dat & 0xffff];
+			dat >>= 16;
+			p[x + 7] = (dat & 0x00008000) ? svga->pallook[dat & 0xff] : video_15to32[dat & 0xffff];
+		} else
+			memset(&(p[x]), 0x00, 8 * sizeof(uint32_t));
 	}
 	svga->ma += x << 1; 
 	svga->ma &= svga->vram_display_mask;
@@ -859,13 +897,16 @@ svga_render_16bpp_lowres(svga_t *svga)
 	svga->lastline_draw = svga->displine;
 
 	for (x = 0; x <= (svga->hdisp + svga->scrollcache); x += 4) {
-		dat = *(uint32_t *)(&svga->vram[(svga->ma + (x << 1)) & svga->vram_display_mask]);
-		p[(x << 1)]     = p[(x << 1) + 1] = video_16to32[dat & 0xffff];
-		p[(x << 1) + 2] = p[(x << 1) + 3] = video_16to32[dat >> 16];
+		if (svga->crtc[0x17] & 0x80) {
+			dat = *(uint32_t *)(&svga->vram[(svga->ma + (x << 1)) & svga->vram_display_mask]);
+			p[(x << 1)]     = p[(x << 1) + 1] = video_16to32[dat & 0xffff];
+			p[(x << 1) + 2] = p[(x << 1) + 3] = video_16to32[dat >> 16];
 
-		dat = *(uint32_t *)(&svga->vram[(svga->ma + (x << 1) + 4) & svga->vram_display_mask]);
-		p[(x << 1) + 4] = p[(x << 1) + 5] = video_16to32[dat & 0xffff];
-		p[(x << 1) + 6] = p[(x << 1) + 7] = video_16to32[dat >> 16];
+			dat = *(uint32_t *)(&svga->vram[(svga->ma + (x << 1) + 4) & svga->vram_display_mask]);
+			p[(x << 1) + 4] = p[(x << 1) + 5] = video_16to32[dat & 0xffff];
+			p[(x << 1) + 6] = p[(x << 1) + 7] = video_16to32[dat >> 16];
+		} else
+			memset(&(p[(x << 1)]), 0x00, 8 * sizeof(uint32_t));
 	}
 	svga->ma += x << 1; 
 	svga->ma &= svga->vram_display_mask;
@@ -890,21 +931,24 @@ svga_render_16bpp_highres(svga_t *svga)
 	svga->lastline_draw = svga->displine;
 
 	for (x = 0; x <= (svga->hdisp + svga->scrollcache); x += 8) {
-		uint32_t dat = *(uint32_t *)(&svga->vram[(svga->ma + (x << 1)) & svga->vram_display_mask]);
-		p[x]     = video_16to32[dat & 0xffff];
-		p[x + 1] = video_16to32[dat >> 16];
+		if (svga->crtc[0x17] & 0x80) {
+			uint32_t dat = *(uint32_t *)(&svga->vram[(svga->ma + (x << 1)) & svga->vram_display_mask]);
+			p[x]     = video_16to32[dat & 0xffff];
+			p[x + 1] = video_16to32[dat >> 16];
 
-		dat = *(uint32_t *)(&svga->vram[(svga->ma + (x << 1) + 4) & svga->vram_display_mask]);
-		p[x + 2] = video_16to32[dat & 0xffff];
-		p[x + 3] = video_16to32[dat >> 16];
+			dat = *(uint32_t *)(&svga->vram[(svga->ma + (x << 1) + 4) & svga->vram_display_mask]);
+			p[x + 2] = video_16to32[dat & 0xffff];
+			p[x + 3] = video_16to32[dat >> 16];
 
-		dat = *(uint32_t *)(&svga->vram[(svga->ma + (x << 1) + 8) & svga->vram_display_mask]);
-		p[x + 4] = video_16to32[dat & 0xffff];
-		p[x + 5] = video_16to32[dat >> 16];
+			dat = *(uint32_t *)(&svga->vram[(svga->ma + (x << 1) + 8) & svga->vram_display_mask]);
+			p[x + 4] = video_16to32[dat & 0xffff];
+			p[x + 5] = video_16to32[dat >> 16];
 
-		dat = *(uint32_t *)(&svga->vram[(svga->ma + (x << 1) + 12) & svga->vram_display_mask]);
-		p[x + 6] = video_16to32[dat & 0xffff];
-		p[x + 7] = video_16to32[dat >> 16];
+			dat = *(uint32_t *)(&svga->vram[(svga->ma + (x << 1) + 12) & svga->vram_display_mask]);
+			p[x + 6] = video_16to32[dat & 0xffff];
+			p[x + 7] = video_16to32[dat >> 16];
+		} else
+			memset(&(p[x]), 0x00, 8 * sizeof(uint32_t));
 	}
 	svga->ma += x << 1; 
 	svga->ma &= svga->vram_display_mask;
@@ -927,7 +971,10 @@ svga_render_24bpp_lowres(svga_t *svga)
 	svga->lastline_draw = svga->displine;
 
 	for (x = 0; x <= (svga->hdisp + svga->scrollcache); x++) {
-		fg = svga->vram[svga->ma] | (svga->vram[svga->ma + 1] << 8) | (svga->vram[svga->ma + 2] << 16);
+		if (svga->crtc[0x17] & 0x80)
+			fg = svga->vram[svga->ma] | (svga->vram[svga->ma + 1] << 8) | (svga->vram[svga->ma + 2] << 16);
+		else
+			fg = 0x00000000;
 		svga->ma += 3; 
 		svga->ma &= svga->vram_display_mask;
 		buffer32->line[svga->displine + svga->y_add][(x << 1) + svga->x_add] =
@@ -955,17 +1002,20 @@ svga_render_24bpp_highres(svga_t *svga)
 	svga->lastline_draw = svga->displine;
 
 	for (x = 0; x <= (svga->hdisp + svga->scrollcache); x += 4) {
-		dat = *(uint32_t *)(&svga->vram[svga->ma & svga->vram_display_mask]);
-		p[x] = dat & 0xffffff;
+		if (svga->crtc[0x17] & 0x80) {
+			dat = *(uint32_t *)(&svga->vram[svga->ma & svga->vram_display_mask]);
+			p[x] = dat & 0xffffff;
 
-		dat = *(uint32_t *)(&svga->vram[(svga->ma + 3) & svga->vram_display_mask]);
-		p[x + 1] = dat & 0xffffff;
+			dat = *(uint32_t *)(&svga->vram[(svga->ma + 3) & svga->vram_display_mask]);
+			p[x + 1] = dat & 0xffffff;
 
-		dat = *(uint32_t *)(&svga->vram[(svga->ma + 6) & svga->vram_display_mask]);
-		p[x + 2] = dat & 0xffffff;
+			dat = *(uint32_t *)(&svga->vram[(svga->ma + 6) & svga->vram_display_mask]);
+			p[x + 2] = dat & 0xffffff;
 
-		dat = *(uint32_t *)(&svga->vram[(svga->ma + 9) & svga->vram_display_mask]);
-		p[x + 3] = dat & 0xffffff;
+			dat = *(uint32_t *)(&svga->vram[(svga->ma + 9) & svga->vram_display_mask]);
+			p[x + 3] = dat & 0xffffff;
+		} else
+			memset(&(p[x]), 0x0, 4 * sizeof(uint32_t));
 
 		svga->ma += 12;
 	}
@@ -989,8 +1039,11 @@ svga_render_32bpp_lowres(svga_t *svga)
 	svga->lastline_draw = svga->displine;
 
 	for (x = 0; x <= (svga->hdisp + svga->scrollcache); x++) {
-		fg = svga->vram[svga->ma] | (svga->vram[svga->ma + 1] << 8) | (svga->vram[svga->ma + 2] << 16);
-		svga->ma += 4; 
+		if (svga->crtc[0x17] & 0x80)
+			fg = svga->vram[svga->ma] | (svga->vram[svga->ma + 1] << 8) | (svga->vram[svga->ma + 2] << 16);
+		else
+			fg = 0x00000000;
+		svga->ma += 4;
 		svga->ma &= svga->vram_display_mask;
 		buffer32->line[svga->displine + svga->y_add][(x << 1) + svga->x_add] =
 		buffer32->line[svga->displine + svga->y_add][(x << 1) + 1 + svga->x_add] = fg;
@@ -1017,7 +1070,10 @@ svga_render_32bpp_highres(svga_t *svga)
 	svga->lastline_draw = svga->displine;
 
 	for (x = 0; x <= (svga->hdisp + svga->scrollcache); x++) {
-		dat = *(uint32_t *)(&svga->vram[(svga->ma + (x << 2)) & svga->vram_display_mask]);
+		if (svga->crtc[0x17] & 0x80)
+			dat = *(uint32_t *)(&svga->vram[(svga->ma + (x << 2)) & svga->vram_display_mask]);
+		else
+			dat = 0x00000000;
 		p[x] = dat & 0xffffff;
 	}
 	svga->ma += 4; 
@@ -1044,7 +1100,10 @@ svga_render_ABGR8888_highres(svga_t *svga)
 	svga->lastline_draw = svga->displine;
 
 	for (x = 0; x <= (svga->hdisp + svga->scrollcache); x++) {
-		dat = *(uint32_t *)(&svga->vram[(svga->ma + (x << 2)) & svga->vram_display_mask]);
+		if (svga->crtc[0x17] & 0x80)
+			dat = *(uint32_t *)(&svga->vram[(svga->ma + (x << 2)) & svga->vram_display_mask]);
+		else
+			dat = 0x00000000;
 		p[x] = ((dat & 0xff0000) >> 16) | (dat & 0x00ff00) | ((dat & 0x0000ff) << 16);
 	}
 	svga->ma += 4; 
@@ -1071,7 +1130,10 @@ svga_render_RGBA8888_highres(svga_t *svga)
 	svga->lastline_draw = svga->displine;
 
 	for (x = 0; x <= (svga->hdisp + svga->scrollcache); x++) {
-		dat = *(uint32_t *)(&svga->vram[(svga->ma + (x << 2)) & svga->vram_display_mask]);
+		if (svga->crtc[0x17] & 0x80)
+			dat = *(uint32_t *)(&svga->vram[(svga->ma + (x << 2)) & svga->vram_display_mask]);
+		else
+			dat = 0x00000000;
 		p[x] = dat >> 8;
 	}
 	svga->ma += 4; 
diff --git a/src/win/86Box.rc b/src/win/86Box.rc
index 1995f7802..845b65844 100644
--- a/src/win/86Box.rc
+++ b/src/win/86Box.rc
@@ -162,6 +162,7 @@ BEGIN
 #endif
     POPUP "&Help"
     BEGIN
+        MENUITEM "&Documentation...",           IDM_DOCS
         MENUITEM "&About 86Box...",             IDM_ABOUT
     END
 END
diff --git a/src/win/win_new_floppy.c b/src/win/win_new_floppy.c
index 0e3da7cb2..9845c77cf 100644
--- a/src/win/win_new_floppy.c
+++ b/src/win/win_new_floppy.c
@@ -544,7 +544,7 @@ create_mo_sector_image(WCHAR *file_name, int8_t disk_size, uint8_t is_mdi, HWND
     total_size = total_sectors * sector_bytes;
 
     total_size2 = (total_size >> 20) << 20;
-    total_size = total_size - total_size2;
+    total_size2 = total_size - total_size2;
 
     pbar_max = total_size;
     pbar_max >>= 20;
diff --git a/src/win/win_ui.c b/src/win/win_ui.c
index ff405e128..304aa246f 100644
--- a/src/win/win_ui.c
+++ b/src/win/win_ui.c
@@ -39,6 +39,7 @@
 #include <86box/plat_midi.h>
 #include <86box/ui.h>
 #include <86box/win.h>
+#include <86box/version.h>
 #ifdef USE_DISCORD
 # include <86box/win_discord.h>
 #endif
@@ -363,6 +364,10 @@ MainWindowProcedure(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
 				AboutDialogCreate(hwnd);
 				break;
 
+			case IDM_DOCS:
+				ShellExecute(hwnd, L"open", EMU_DOCS_URL, NULL, NULL, SW_SHOW);
+				break;
+
 			case IDM_UPDATE_ICONS:
 				update_icons ^= 1;
 				CheckMenuItem(hmenu, IDM_UPDATE_ICONS, update_icons ? MF_CHECKED : MF_UNCHECKED);