diff --git a/DRV/DHGR.DRV.S.txt b/DRV/DHGR.DRV.S.txt
index 712716b1..71b5afba 100644
--- a/DRV/DHGR.DRV.S.txt
+++ b/DRV/DHGR.DRV.S.txt
@@ -39,7 +39,6 @@ Dev.Detect		>LDYA L.MSG.DETECT
 				>SYSCALL SYS.PSTROutYA
 				
 				ldx #0
-				
 .1				txa
 				stz Shift0.hi,x
 				asl
@@ -47,8 +46,9 @@ Dev.Detect		>LDYA L.MSG.DETECT
 				lsr
 				sta Shift0.lo,x
 				inx
-				bne .1
+				bpl .1
 				
+				ldx #0
 .2				lda Shift0.hi,x
 				sta Shift1.hi,x
 				lda Shift0.lo,x
@@ -58,8 +58,9 @@ Dev.Detect		>LDYA L.MSG.DETECT
 				lsr
 				sta Shift1.lo,x
 				inx
-				bne .2
+				bpl .2
 				
+				ldx #0
 .3				lda Shift1.hi,x
 				sta Shift2.hi,x
 				lda Shift1.lo,x
@@ -69,8 +70,9 @@ Dev.Detect		>LDYA L.MSG.DETECT
 				lsr
 				sta Shift2.lo,x
 				inx
-				bne .3
+				bpl .3
 				
+				ldx #0
 .4				lda Shift2.hi,x
 				sta Shift3.hi,x
 				lda Shift2.lo,x
@@ -80,8 +82,9 @@ Dev.Detect		>LDYA L.MSG.DETECT
 				lsr
 				sta Shift3.lo,x
 				inx
-				bne .4
+				bpl .4
 				
+				ldx #0
 .5				lda Shift3.hi,x
 				sta Shift4.hi,x
 				lda Shift3.lo,x
@@ -91,8 +94,9 @@ Dev.Detect		>LDYA L.MSG.DETECT
 				lsr
 				sta Shift4.lo,x
 				inx
-				bne .5
+				bpl .5
 				
+				ldx #0
 .6				lda Shift4.hi,x
 				sta Shift5.hi,x
 				lda Shift4.lo,x
@@ -102,8 +106,9 @@ Dev.Detect		>LDYA L.MSG.DETECT
 				lsr
 				sta Shift5.lo,x
 				inx
-				bne .6
+				bpl .6
 				
+				ldx #0
 .7				lda Shift5.hi,x
 				sta Shift6.hi,x
 				lda Shift5.lo,x
@@ -113,7 +118,7 @@ Dev.Detect		>LDYA L.MSG.DETECT
 				lsr
 				sta Shift6.lo,x
 				inx
-				bne .7
+				bpl .7
 				
 				clc
 				rts
@@ -257,37 +262,39 @@ SETPIXEL		sta SET80STORE
 				and #$FF
 				bpl SETPIXEL.1
 				
-SETPIXEL.XOR	>PULLYA					Y=X.LO,A=X.HI
-				lsr						if 256 =< x < 511 
-				bcs .1
-				lsr
-				bcs	.2					if 512 < x
-				lda DIV7.0,y
-				ldx MOD7.0,y
-				bra .3
-				
-.1				lda DIV7.256,y
-				ldx MOD7.256,y
-				bra .3
-
-.2				lda DIV7.512,y
-				ldx MOD7.512,y
-
-.3				lsr
+SETPIXEL.XOR	>PULLAX					A=X.LO,X=X.HI
 				tay
-				sta CLRPAGE2
-				bcs .4					odd=main ram
-				sta SETPAGE2
 				
-.4				>PULLA					Pull Y
+				lda DIV7.hi,x
+				sta .1+2
+				lda MOD7.hi,x
+				sta .2+2
+			
+.1				lda DIV7.0,y			A=Colx2
+				eor #1
+				
+				lsr						A=Col, CS=MMem, CC=XMem
+				pha 					Save Col
+
+
+				lda #CLRPAGE2>1
+				asl
+				sta .3+1
+.3				sta CLRPAGE2
+				
+
+				>PULLA					Pull Y
 				tax
 				lda BASEL,x				setup line Base Ptr
 				sta ZPBase
 				lda BASEH,x
 				sta ZPBase+1
 				
+.2				ldx MOD7.0,y			Y=X.LO
+
+				ply						get back Col
 				lda (ZPBase),y
-				eor Mono.Masks,x
+				eor Mono.Masks,x		x = mod 7
 				sta (ZPBase),y
 				
 				sta CLR80STORE
@@ -621,20 +628,20 @@ HIDECUR.RTS		clc
 *--------------------------------------
 DRV.CS.END
 *--------------------------------------
-Shift0.lo		.BS 256
-Shift0.hi		.BS 256
-Shift1.lo		.BS 256
-Shift1.hi		.BS 256
-Shift2.lo		.BS 256
-Shift2.hi		.BS 256
-Shift3.lo		.BS 256
-Shift3.hi		.BS 256
-Shift4.lo		.BS 256
-Shift4.hi		.BS 256
-Shift5.lo		.BS 256
-Shift5.hi		.BS 256
-Shift6.lo		.BS 256
-Shift6.hi		.BS 256
+Shift0.lo		.BS 1
+Shift0.hi		.BS 1
+Shift1.lo		.BS 1
+Shift1.hi		.BS 1
+Shift2.lo		.BS 1
+Shift2.hi		.BS 1
+Shift3.lo		.BS 1
+Shift3.hi		.BS 1
+Shift4.lo		.BS 1
+Shift4.hi		.BS 1
+Shift5.lo		.BS 1
+Shift5.hi		.BS 1
+Shift6.lo		.BS 128
+Shift6.hi		.BS 128
 *--------------------------------------
 				.INB DRV/DHGR.DRV.T
 *--------------------------------------