diff --git a/grafproc.asm b/grafproc.asm
index d0bfb38..85bce0f 100755
--- a/grafproc.asm
+++ b/grafproc.asm
@@ -1175,7 +1175,7 @@ DrawLine .proc
     sec
     sbc ydraw
     sta tempbyte01
-    jsr plot
+    jsr plot.MakePlot
     ;rts
     jmp IntoDraw    ; jumps inside Draw routine
     ; because one pixel is already plotted
@@ -1261,29 +1261,21 @@ CopyMask
     ldx ybit
     beq MaskOK00
 MakeMask00
-    clc		; INVERSE
-    ror mask1
+    lsr mask1	; INVERSE
     ror mask2
-    clc		; INVERSE
-    ror mask1+1
+    lsr mask1+1	; INVERSE
     ror mask2+1
-    clc		; INVERSE
-    ror mask1+2
+    lsr mask1+2	; INVERSE
     ror mask2+2
-    clc		; INVERSE
-    ror mask1+3
+    lsr mask1+3	; INVERSE
     ror mask2+3
-    clc		; INVERSE
-    ror mask1+4
+    lsr mask1+4	; INVERSE
     ror mask2+4
-    clc		; INVERSE
-    ror mask1+5
+    lsr mask1+5	; INVERSE
     ror mask2+5
-    clc		; INVERSE
-    ror mask1+6
+    lsr mask1+6	; INVERSE
     ror mask2+6
-    clc		; INVERSE
-    ror mask1+7
+    lsr mask1+7	; INVERSE
     ror mask2+7
     sec		; INVERSE
     ror char1
diff --git a/scorch.xex b/scorch.xex
index b07755f..ad2c797 100644
Binary files a/scorch.xex and b/scorch.xex differ
diff --git a/weapons.asm b/weapons.asm
index 2225850..2a2a350 100755
--- a/weapons.asm
+++ b/weapons.asm
@@ -949,11 +949,13 @@ FillHole
     adw xdraw #mountaintable tempXROLLER
 	lda (tempXROLLER),y
 	sta ydraw
+	beq ToHighFill	; if we filled all playfield (very rare but possible)
 	dec ydraw	; one pixel up
+ToHighFill
 	lda ydraw
     sta (tempXROLLER),y	;mountaintable update
 	mva #1 color
-	jsr plot
+	jsr plot.MakePlot
 .nowarn dew FillCounter
 	cpw FillCounter #0
 	jne RepeatFill