diff --git a/scorch.asm b/scorch.asm
index 0504b35..b8b2e59 100644
--- a/scorch.asm
+++ b/scorch.asm
@@ -577,10 +577,10 @@ RoboTanks
     lda kbcode
     cmp #28  ; ESC
     bne @+
-      jsr AreYouSure
-      bit escFlag
-	  spl:rts
-@
+    jsr AreYouSure
+@	lda escFlag
+    seq:rts		; keys Esc or O
+
 
     jmp AfterManualShooting
 
diff --git a/scorch.xex b/scorch.xex
index 58cbcb9..5d0ef50 100644
Binary files a/scorch.xex and b/scorch.xex differ
diff --git a/textproc.asm b/textproc.asm
index dab2f2c..d86f0d2 100644
--- a/textproc.asm
+++ b/textproc.asm
@@ -1111,7 +1111,9 @@ LastNameChar
     lda #$80 ; place cursor on the end
     sta NameAdr,y
 	dey
-    sty PositionInName
+	bpl @+
+	iny	; if old name is empty or first time entering
+@   sty PositionInName
 
 
 CheckKeys