diff --git a/src/video/vid_paradise.c b/src/video/vid_paradise.c
index f79b93407..edb732032 100644
--- a/src/video/vid_paradise.c
+++ b/src/video/vid_paradise.c
@@ -40,6 +40,8 @@ typedef struct paradise_t
         
         rom_t bios_rom;
         
+		uint8_t pr0a, pr0b, pr1, pr5, bank_mask;		
+		
         enum
         {
                 PVGA1A = 0,
@@ -50,6 +52,23 @@ typedef struct paradise_t
 		uint32_t vram_mask;
 
         uint32_t read_bank[4], write_bank[4];
+		
+		int interlace;
+		
+		struct {
+			uint8_t reg_block_ptr;
+			uint8_t reg_idx;
+			uint8_t disable_autoinc;
+			
+			uint16_t int_status;
+			uint16_t blt_ctrl1, blt_ctrl2;
+			uint16_t srclow, srchigh;
+			uint16_t dstlow, dsthigh;
+
+			uint32_t srcaddr, dstaddr;
+			
+			int invalid_block;
+		} accel;
 } paradise_t;
 
 static video_timings_t timing_paradise_pvga1a	= {VIDEO_ISA, 6,  8, 16,   6,  8, 16};
@@ -57,79 +76,85 @@ static video_timings_t timing_paradise_wd90c	= {VIDEO_ISA, 3,  3,  6,   5,  5, 1
 
 void paradise_remap(paradise_t *paradise);
 
-
 void paradise_out(uint16_t addr, uint8_t val, void *p)
 {
         paradise_t *paradise = (paradise_t *)p;
         svga_t *svga = &paradise->svga;
-        uint8_t old;
-        
+        uint8_t old, o;
+		
+		if (paradise->vram_mask <= ((512 << 10) - 1))
+			paradise->bank_mask = 0x7f;
+		else
+			paradise->bank_mask = 0xff;
+	
         if (((addr & 0xfff0) == 0x3d0 || (addr & 0xfff0) == 0x3b0) && !(svga->miscout & 1)) 
                 addr ^= 0x60;
+
         switch (addr)
         {
                 case 0x3c5:
-                if (svga->seqaddr > 7)                        
+                if (svga->seqaddr > 7) 
                 {
                         if (paradise->type < WD90C11 || svga->seqregs[6] != 0x48) 
-                           return;
+							return;
                         svga->seqregs[svga->seqaddr & 0x1f] = val;
-                        if (svga->seqaddr == 0x11)
-                           paradise_remap(paradise);
+                        if (svga->seqaddr == 0x11) {
+							paradise_remap(paradise);
+						}
                         return;
                 }
                 break;
 
                 case 0x3cf:
-                if (svga->gdcaddr >= 0x9 && svga->gdcaddr < 0xf)
-                {
-                        if ((svga->gdcreg[0xf] & 7) != 5)
-                           return;
+                if (svga->gdcaddr >= 9 && svga->gdcaddr <= 0x0e) {
+					if ((paradise->pr5 & 7) != 5)
+						return;
                 }
-                if (svga->gdcaddr == 6)
-                {
-                        if ((svga->gdcreg[6] & 0xc) != (val & 0xc))
-                        {
-                                switch (val&0xC)
-                                {
-                                        case 0x0: /*128k at A0000*/
-                                        mem_mapping_set_addr(&svga->mapping, 0xa0000, 0x20000);
-                                        svga->banked_mask = 0xffff;
-                                        break;
-                                        case 0x4: /*64k at A0000*/
-                                        mem_mapping_set_addr(&svga->mapping, 0xa0000, 0x10000);
-                                        svga->banked_mask = 0xffff;
-                                        break;
-                                        case 0x8: /*32k at B0000*/
-                                        mem_mapping_set_addr(&svga->mapping, 0xb0000, 0x08000);
-                                        svga->banked_mask = 0x7fff;
-                                        break;
-                                        case 0xC: /*32k at B8000*/
-                                        mem_mapping_set_addr(&svga->mapping, 0xb8000, 0x08000);
-                                        svga->banked_mask = 0x7fff;
-                                        break;
-                                }
-                        }
-                        svga->gdcreg[6] = val;
-                        paradise_remap(paradise);
-                        return;
-                }
-                if (svga->gdcaddr == 0x9 || svga->gdcaddr == 0xa || svga->gdcaddr == 0xb)
-                {
-                        svga->gdcreg[svga->gdcaddr] = val;
-                        paradise_remap(paradise);
-                        return;
-                }
-				if (svga->gdcaddr == 0xd) {
-						svga->gdcreg[0xd] = val;
-						svga_recalctimings(svga);
-                        return;				
+				switch (svga->gdcaddr) {
+					case 6:
+						if (val & 8)
+							svga->banked_mask = 0x7fff;
+						else
+							svga->banked_mask = 0xffff;
+						if (svga->gdcreg[6] != val)
+							svga->gdcreg[6] = val;
+						paradise_remap(paradise);
+						break;
+					
+					case 9:
+						paradise->pr0a = val & paradise->bank_mask;
+						paradise_remap(paradise);
+						break;
+					case 0x0a:
+						paradise->pr0b = val & paradise->bank_mask;
+						paradise_remap(paradise);
+						break;
+					case 0x0b:
+						paradise->pr1 = val;
+						paradise_remap(paradise);
+						break;
+					case 0x0d:
+						o = svga->gdcreg[0x0d];
+						svga->gdcreg[0x0d] = val;
+						if ((o ^ val) & 0x18)
+							svga_recalctimings(svga);
+						break;
+					case 0x0e:
+						o = svga->gdcreg[0x0e];
+						svga->gdcreg[0x0e] = val;
+						if ((o ^ val) & 0x01)
+							svga_recalctimings(svga);
+						break;
+					case 0x0c:
+						svga->gdcreg[0x0c] = val;
+						break;
+					case 0x0f:
+						paradise->pr5 = val;
+						break;
+					default:
+						svga->gdcreg[svga->gdcaddr] = val;
+						break;
 				}
-                if (svga->gdcaddr == 0xe) {
-                        svga->gdcreg[0xe] = val;
-						svga_recalctimings(svga);
-                        return;
-                }
                 break;
                 
                 case 0x3D4:
@@ -148,7 +173,7 @@ void paradise_out(uint16_t addr, uint8_t val, void *p)
                    return;
                 old = svga->crtc[svga->crtcreg];
                 svga->crtc[svga->crtcreg] = val;
-
+				
                 if (old != val)
                 {
                         if (svga->crtcreg < 0xe || svga->crtcreg > 0x10)
@@ -162,16 +187,10 @@ void paradise_out(uint16_t addr, uint8_t val, void *p)
 				}
                         }
                 }
-
-				switch (svga->crtcreg) {
-					case 0x2f:
-						if (paradise->type != PVGA1A)
-							svga->vram_display_mask = (val & 1) ? 0x3ffff : paradise->vram_mask;
-						break;
-				}
                 break;
         }
-        svga_out(addr, val, svga);
+		
+		svga_out(addr, val, svga);
 }
 
 uint8_t paradise_in(uint16_t addr, void *p)
@@ -184,40 +203,58 @@ uint8_t paradise_in(uint16_t addr, void *p)
         
         switch (addr)
         {
-                case 0x3c2:
-                return 0x10;
-                
                 case 0x3c5:
                 if (svga->seqaddr > 7)
                 {
                         if (paradise->type < WD90C11 || svga->seqregs[6] != 0x48) 
-                           return 0xff;
-                        if (svga->seqaddr > 0x12) 
-                           return 0xff;
+							return 0xff;
+						if (paradise->type < WD90C30) {
+							if (svga->seqaddr > 0x12) 
+								return 0xff;
+						}
                         return svga->seqregs[svga->seqaddr & 0x1f];
                 }
                 break;
                         
                 case 0x3cf:
-                if (svga->gdcaddr >= 0x9 && svga->gdcaddr < 0xf)
-                {
-                        if (svga->gdcreg[0xf] & 0x10)
-                           return 0xff;
-                        switch (svga->gdcaddr)
-                        {
-                                case 0xf:
-                                return (svga->gdcreg[0xf] & 0x17) | 0x80;
-                        }
+                if (svga->gdcaddr >= 9 && svga->gdcaddr <= 0x0e) {
+					if ((paradise->pr5 & 7) != 5)
+						return 0xff;
                 }
+				switch (svga->gdcaddr) {
+					case 9:
+						return paradise->pr0a;
+					case 0x0a:
+						return paradise->pr0b;
+					case 0x0b:
+						if (paradise->vram_mask == (512 << 10) - 1) {
+							paradise->pr1 |= 0xc0;
+							paradise->pr1 &= ~0x40;
+						} else if (paradise->vram_mask == (1024 << 10) - 1) {
+							paradise->pr1 |= 0xc0;
+							if (svga->bpp >= 8 && !svga->lowres) /*Horrible tweak, but needed to get around black corruption in 1M mode*/
+								paradise->pr1 &= ~0x40;
+						}
+						return paradise->pr1;
+					case 6:
+					case 0x0c:
+					case 0x0d:
+					case 0x0e:
+						return svga->gdcreg[svga->gdcaddr];
+					case 0x0f:
+						return (paradise->pr5 & 0x17) | 0x80;
+					default:
+						return svga->gdcreg[svga->gdcaddr];
+				}
                 break;
 
                 case 0x3D4:
                 return svga->crtcreg;
                 case 0x3D5:
                 if ((paradise->type == PVGA1A) && (svga->crtcreg & 0x20))
-                        return 0xff;
+					return 0xff;				
                 if (svga->crtcreg > 0x29 && svga->crtcreg < 0x30 && (svga->crtc[0x29] & 0x88) != 0x80)
-                   return 0xff;
+					return 0xff;
                 return svga->crtc[svga->crtcreg];
         }
         return svga_in(addr, svga);
@@ -227,46 +264,49 @@ void paradise_remap(paradise_t *paradise)
 {
         svga_t *svga = &paradise->svga;
 
-	uint8_t mask = (paradise->type == WD90C11) ? 0x7f : 0xff;
-        
-        if (svga->seqregs[0x11] & 0x80)
-        {
-                paradise->read_bank[0]  = paradise->read_bank[2]  =  (svga->gdcreg[0x9] & mask) << 12;
-                paradise->read_bank[1]  = paradise->read_bank[3]  = ((svga->gdcreg[0x9] & mask) << 12) + ((svga->gdcreg[6] & 0x08) ? 0 : 0x8000);
-                paradise->write_bank[0] = paradise->write_bank[2] =  (svga->gdcreg[0xa] & mask) << 12;
-                paradise->write_bank[1] = paradise->write_bank[3] = ((svga->gdcreg[0xa] & mask) << 12) + ((svga->gdcreg[6] & 0x08) ? 0 : 0x8000);
-        }
-        else if (svga->gdcreg[0xb] & 0x08)
-        {	
-                if (svga->gdcreg[0x6] & 0xc)
-                {
-                        paradise->read_bank[0]  = paradise->read_bank[2]  =  (svga->gdcreg[0xa] & mask) << 12;
-                        paradise->write_bank[0] = paradise->write_bank[2] =  (svga->gdcreg[0xa] & mask) << 12;
-                        paradise->read_bank[1]  = paradise->read_bank[3]  = ((svga->gdcreg[0x9] & mask) << 12) + ((svga->gdcreg[6] & 0x08) ? 0 : 0x8000);
-                        paradise->write_bank[1] = paradise->write_bank[3] = ((svga->gdcreg[0x9] & mask) << 12) + ((svga->gdcreg[6] & 0x08) ? 0 : 0x8000);
-                }
-                else
-                {
-                        paradise->read_bank[0] = paradise->write_bank[0] =  (svga->gdcreg[0xa] & mask) << 12;
-                        paradise->read_bank[1] = paradise->write_bank[1] = ((svga->gdcreg[0xa] & mask) << 12) + ((svga->gdcreg[6] & 0x08) ? 0 : 0x8000);
-                        paradise->read_bank[2] = paradise->write_bank[2] =  (svga->gdcreg[0x9] & mask) << 12;
-                        paradise->read_bank[3] = paradise->write_bank[3] = ((svga->gdcreg[0x9] & mask) << 12) + ((svga->gdcreg[6] & 0x08) ? 0 : 0x8000);
-                }
-        }
-        else
-        {
-                paradise->read_bank[0]  = paradise->read_bank[2]  =  (svga->gdcreg[0x9] & mask) << 12;
-                paradise->read_bank[1]  = paradise->read_bank[3]  = ((svga->gdcreg[0x9] & mask) << 12) + ((svga->gdcreg[6] & 0x08) ? 0 : 0x8000);
-                paradise->write_bank[0] = paradise->write_bank[2] =  (svga->gdcreg[0x9] & mask) << 12;
-                paradise->write_bank[1] = paradise->write_bank[3] = ((svga->gdcreg[0x9] & mask) << 12) + ((svga->gdcreg[6] & 0x08) ? 0 : 0x8000);
-        }
-
-		if (paradise->type == WD90C11) {
+        if (svga->seqregs[0x11] & 0x80) {
+			paradise->read_bank[0] = (paradise->pr0a) << 12;
+			paradise->read_bank[1] = paradise->read_bank[0] + ((svga->gdcreg[6] & 8) ? 0 : 0x8000);
+			paradise->read_bank[2] = paradise->read_bank[0];
+			paradise->read_bank[3] = paradise->read_bank[1];
+			paradise->write_bank[0] = (paradise->pr0b) << 12;
+			paradise->write_bank[1] = paradise->write_bank[0] + ((svga->gdcreg[6] & 8) ? 0 : 0x8000);
+			paradise->write_bank[2] = paradise->write_bank[0];
+			paradise->write_bank[3] = paradise->write_bank[1];
+		 } else if (paradise->pr1 & 8) {
+			if (svga->gdcreg[6] & 0x0c) {
+				paradise->read_bank[0] = (paradise->pr0b) << 12;
+				paradise->read_bank[1] = ((paradise->pr0a) << 12) + ((svga->gdcreg[6] & 8) ? 0 : 0x8000);
+				paradise->read_bank[2] = paradise->read_bank[0];
+				paradise->read_bank[3] = paradise->read_bank[1];
+				paradise->write_bank[0] = (paradise->pr0b) << 12;
+				paradise->write_bank[1] = ((paradise->pr0a) << 12) + ((svga->gdcreg[6] & 8) ? 0 : 0x8000);
+				paradise->write_bank[2] = paradise->write_bank[0];
+				paradise->write_bank[3] = paradise->write_bank[1];
+			} else {
+				paradise->read_bank[0] = (paradise->pr0b) << 12;
+				paradise->read_bank[1] = paradise->read_bank[0] + ((svga->gdcreg[6] & 8) ? 0 : 0x8000);
+				paradise->read_bank[2] = (paradise->pr0a) << 12;
+				paradise->read_bank[3] = paradise->read_bank[2] + ((svga->gdcreg[6] & 8) ? 0 : 0x8000);				
+				paradise->write_bank[0] = (paradise->pr0b) << 12;
+				paradise->write_bank[1] = paradise->write_bank[0] + ((svga->gdcreg[6] & 8) ? 0 : 0x8000);
+				paradise->write_bank[2] = (paradise->pr0a) << 12;
+				paradise->write_bank[3] = paradise->write_bank[2] + ((svga->gdcreg[6] & 8) ? 0 : 0x8000);
+			}
+        } else {
+			paradise->read_bank[0] = (paradise->pr0a) << 12;
+			paradise->write_bank[0] = (paradise->pr0a) << 12;
+			paradise->read_bank[1] = paradise->read_bank[0] + ((svga->gdcreg[6] & 8) ? 0 : 0x8000);
+			paradise->write_bank[1] = paradise->write_bank[0] + ((svga->gdcreg[6] & 8) ? 0 : 0x8000);
+			paradise->read_bank[2] = paradise->read_bank[0];
+			paradise->write_bank[2] = paradise->write_bank[0];
+			paradise->read_bank[3] = paradise->read_bank[0] + ((svga->gdcreg[6] & 8) ? 0 : 0x8000);
+			paradise->write_bank[3] = paradise->write_bank[0] + ((svga->gdcreg[6] & 8) ? 0 : 0x8000);
+		}
+		
+		if (paradise->bank_mask == 0x7f) {
 			paradise->read_bank[1] &= 0x7ffff;
 			paradise->write_bank[1] &= 0x7ffff;
-		} else {
-			paradise->read_bank[1] &= 0xfffff;
-			paradise->write_bank[1] &= 0xfffff;			
 		}
 }
 
@@ -274,50 +314,73 @@ void paradise_recalctimings(svga_t *svga)
 {
 	paradise_t *paradise = (paradise_t *) svga->p;
 
-	if (svga->gdcreg[0xd] & 0x08) svga->ma_latch |= 0x10000;
-	if (svga->gdcreg[0xd] & 0x10) svga->ma_latch |= 0x20000;
+	if (svga->gdcreg[0x0d] & 0x08) svga->ma_latch |= 0x10000;
+	if (svga->gdcreg[0x0d] & 0x10) svga->ma_latch |= 0x20000;
+
+	svga->lowres = !(svga->gdcreg[0x0e] & 0x01);
 
 	if (paradise->type == WD90C30) {
-		if (svga->crtc[0x3d] & 0x01) svga->vtotal |= 0x400;
-		if (svga->crtc[0x3d] & 0x02) svga->dispend |= 0x400;
-		if (svga->crtc[0x3d] & 0x04) svga->vsyncstart |= 0x400;
-		if (svga->crtc[0x3d] & 0x08) svga->vblankstart |= 0x400;
-		if (svga->crtc[0x3d] & 0x10) svga->split |= 0x400;
+		if (svga->crtc[0x3e] & 0x01) svga->vtotal |= 0x400;
+		if (svga->crtc[0x3e] & 0x02) svga->dispend |= 0x400;
+		if (svga->crtc[0x3e] & 0x04) svga->vsyncstart |= 0x400;
+		if (svga->crtc[0x3e] & 0x08) svga->vblankstart |= 0x400;
+		if (svga->crtc[0x3e] & 0x10) svga->split |= 0x400;
 
-		svga->interlace = (svga->crtc[0x2d] & 0x20);
-	}
-	
-	svga->lowres = !(svga->gdcreg[0xe] & 0x01);
-	
-	if (svga->bpp == 8 && !svga->lowres) {
-        svga->render = svga_render_8bpp_highres;
+		svga->interlace = !!(svga->crtc[0x2d] & 0x20);
+		
+		if (!svga->interlace && svga->lowres && (svga->hdisp >= 1024) && 
+			((svga->gdcreg[5] & 0x60) == 0) && (svga->miscout >= 0x27) && 
+			(svga->miscout <= 0x2f) && ((svga->gdcreg[6] & 1) || 
+			(svga->attrregs[0x10] & 1))) { /*Horrible tweak to re-enable the interlace after returning to
+											 a windowed DOS box in Win3.x*/
+			svga->interlace = 1;
+		}
 	}
+
+	if (svga->bpp >= 8 && !svga->lowres)
+		svga->render = svga_render_8bpp_highres;
 }
 
 static void paradise_write(uint32_t addr, uint8_t val, void *p)
 {
         paradise_t *paradise = (paradise_t *)p;
-        addr = (addr & 0x7fff) + paradise->write_bank[(addr >> 15) & 3];
-        svga_write_linear(addr, val, &paradise->svga);
+		svga_t *svga = &paradise->svga;
+
+		addr &= svga->banked_mask;
+		addr = (addr & 0x7fff) + paradise->write_bank[(addr >> 15) & 3];
+		
+		svga_write_linear(addr, val, svga);
 }
 static void paradise_writew(uint32_t addr, uint16_t val, void *p)
 {
         paradise_t *paradise = (paradise_t *)p;
-        addr = (addr & 0x7fff) + paradise->write_bank[(addr >> 15) & 3];
-        svga_writew_linear(addr, val, &paradise->svga);
+		svga_t *svga = &paradise->svga;
+
+		addr &= svga->banked_mask;
+		addr = (addr & 0x7fff) + paradise->write_bank[(addr >> 15) & 3];
+
+		svga_writew_linear(addr, val, svga);
 }
 
 static uint8_t paradise_read(uint32_t addr, void *p)
 {
         paradise_t *paradise = (paradise_t *)p;
-        addr = (addr & 0x7fff) + paradise->read_bank[(addr >> 15) & 3];
-        return svga_read_linear(addr, &paradise->svga);
+		svga_t *svga = &paradise->svga;
+
+		addr &= svga->banked_mask;
+		addr = (addr & 0x7fff) + paradise->read_bank[(addr >> 15) & 3];
+
+		return svga_read_linear(addr, svga);
 }
 static uint16_t paradise_readw(uint32_t addr, void *p)
 {
         paradise_t *paradise = (paradise_t *)p;
-        addr = (addr & 0x7fff) + paradise->read_bank[(addr >> 15) & 3];
-        return svga_readw_linear(addr, &paradise->svga);
+		svga_t *svga = &paradise->svga;
+
+		addr &= svga->banked_mask;
+		addr = (addr & 0x7fff) + paradise->read_bank[(addr >> 15) & 3];
+
+        return svga_readw_linear(addr, svga);
 }
 
 void *paradise_init(const device_t *info, uint32_t memsize)
@@ -325,8 +388,6 @@ void *paradise_init(const device_t *info, uint32_t memsize)
         paradise_t *paradise = malloc(sizeof(paradise_t));
         svga_t *svga = &paradise->svga;
         memset(paradise, 0, sizeof(paradise_t));
-        
-        io_sethandler(0x03c0, 0x0020, paradise_in, NULL, NULL, paradise_out, NULL, NULL, paradise);
 
 	if (info->local == PVGA1A)
 		video_inform(VIDEO_FLAG_TYPE_SPECIAL, &timing_paradise_pvga1a);
@@ -335,33 +396,38 @@ void *paradise_init(const device_t *info, uint32_t memsize)
 
 	switch(info->local) {
 		case PVGA1A:
-			svga_init(info, &paradise->svga, paradise, memsize, /*256kb*/
+			svga_init(info, svga, paradise, memsize, /*256kb*/
 				   paradise_recalctimings,
 				   paradise_in, paradise_out,
 				   NULL,
 				   NULL);
 			paradise->vram_mask = memsize - 1;
+			svga->decode_mask = memsize - 1;
 			break;
 		case WD90C11:
-			svga_init(info, &paradise->svga, paradise, 1 << 19, /*512kb*/
+			svga_init(info, svga, paradise, 1 << 19, /*512kb*/
 				   paradise_recalctimings,
 				   paradise_in, paradise_out,
 				   NULL,
 				   NULL);
 			paradise->vram_mask = (1 << 19) - 1;
+			svga->decode_mask = (1 << 19) - 1;
 			break;
 		case WD90C30:
-			svga_init(info, &paradise->svga, paradise, memsize,
+			svga_init(info, svga, paradise, memsize,
 				   paradise_recalctimings,
 				   paradise_in, paradise_out,
 				   NULL,
 				   NULL);
 			paradise->vram_mask = memsize - 1;
+			svga->decode_mask = memsize - 1;
 			break;
 	}
+	
+	mem_mapping_set_handler(&svga->mapping, paradise_read, paradise_readw, NULL, paradise_write, paradise_writew, NULL);
+	mem_mapping_set_p(&svga->mapping, paradise);
 
-        mem_mapping_set_handler(&svga->mapping, paradise_read, paradise_readw, NULL, paradise_write, paradise_writew, NULL);
-        mem_mapping_set_p(&svga->mapping, paradise);
+	io_sethandler(0x03c0, 0x0020, paradise_in, NULL, NULL, paradise_out, NULL, NULL, paradise);
 
 	/* Common to all three types. */
 	svga->crtc[0x31] = 'W';
@@ -381,12 +447,12 @@ void *paradise_init(const device_t *info, uint32_t memsize)
 			break;
 	}
 
-        svga->bpp = 8;
-        svga->miscout = 1;
+	svga->bpp = 8;
+	svga->miscout = 1;
 
-        paradise->type = info->local;
+	paradise->type = info->local;
         
-        return paradise;
+	return paradise;
 }
 
 static void *paradise_pvga1a_ncr3302_init(const device_t *info)