diff --git a/lib/macro.hea b/lib/macro.hea
index 2a73514..6181aa6 100644
--- a/lib/macro.hea
+++ b/lib/macro.hea
@@ -76,6 +76,9 @@
          .MACRO WAIT
 ;	WAIT
 ;	waits one frame (1/50 s(PAL) or 1/60s(NTSC))
+        lda CONSOL
+        cmp #6  ; START KEY
+        beq ?nowait
          LDA VCOUNT
          ldy vcount
 ?WA      cpy VCOUNT
@@ -83,6 +86,7 @@
 ?wframe
          cmp vcount
          bne ?wframe
+?nowait
          .ENDM
 ;-------------------------------------
     .macro negw
diff --git a/scorch.xex b/scorch.xex
index 46bd17c..6c4480d 100644
Binary files a/scorch.xex and b/scorch.xex differ
diff --git a/textproc.asm b/textproc.asm
index 4b6f13e..e2011fc 100755
--- a/textproc.asm
+++ b/textproc.asm
@@ -1581,15 +1581,6 @@ FinishResultDisplay
     lda WeaponSymbols,y
     sta TextBuffer+18
 
-    ;---------------------
-    ;displaying the energy of a tank
-    ;---------------------
-
-    lda Energy,x
-
-    sta decimal
-    mwa #textbuffer+48 displayposition
-    jsr displaybyte
     ;---------------------
     ;displaying quantity of the given weapon
     ;---------------------
@@ -1608,20 +1599,31 @@ FinishResultDisplay
     sta temp ;get back number of the weapon
     mva #0 temp+1
     ; times 16 (because this is length of weapon name)
-    ldy #3 ; rotate 4 times
-RotateDISP02
-    aslw temp
-    dey
-    bpl RotateDISP02
+    ldy #3 ; shift left 4 times
+@
+      aslw temp
+      dey
+    bpl @-
+ 
     adw temp #NamesOfWeapons
     ldy #6 ; from 6th character
 
     ldy #15
-loop06
-    lda (temp),y
-    sta textbuffer+23,y
-    dey
-    bpl loop06
+@
+      lda (temp),y
+      sta textbuffer+23,y
+      dey
+    bpl @-
+
+    ;---------------------
+    ;displaying the energy of a tank
+    ;---------------------
+
+    lda Energy,x
+
+    sta decimal
+    mwa #textbuffer+48 displayposition
+    jsr displaybyte
 
     ;=========================
     ;display Force
diff --git a/weapons.asm b/weapons.asm
index 25301ba..4426775 100755
--- a/weapons.asm
+++ b/weapons.asm
@@ -753,7 +753,7 @@ UpNotYet
     beq HowMuchToFallRight2
 .nowarn    dew xdraw
     lda xdraw
-    bne RollinContinues		; like cpw xdraw #0
+    jne RollinContinues		; like cpw xdraw #0
     lda xdraw+1
     jne RollinContinues
     beq ExplodeNow
@@ -1274,7 +1274,7 @@ AfterStrongShoot
 
 
 ;--------------------------------------------------
-TankFalls .proc;
+.proc TankFalls;
 ;--------------------------------------------------
     mva #sfx_shield_off sfx_effect
     lda #0
@@ -2380,6 +2380,9 @@ HowManyBullets .proc
 
 ;--------------------------------------------------
 ShellDelay .proc
+    lda CONSOL
+    cmp #6
+    beq noShellDelay
     ldx flyDelay
 DelayLoop
       lda VCOUNT
@@ -2387,6 +2390,7 @@ DelayLoop
       beq @-
       dex
     bne DelayLoop
+noShellDelay
     rts
 .endp