diff --git a/games/lemm/keyboard.s b/games/lemm/keyboard.s
index 719c6e14..4c9b408d 100644
--- a/games/lemm/keyboard.s
+++ b/games/lemm/keyboard.s
@@ -232,24 +232,6 @@ return_check_lemming:
 	pha
 	rts					; jump to it
 
-;	cmp	#1
-;	beq	make_climber
-;	cmp	#2
-;	beq	make_floater
-;	cmp	#3
-;	beq	make_exploding
-;	cmp	#4
-;	beq	make_stopper
-;	cmp	#5
-;	beq	make_builder
-;	cmp	#6
-;	beq	make_basher
-;	cmp	#7
-;	beq	make_miner
-;	cmp	#8
-;	beq	make_digger
-;	bne	done_keypress
-
 
 not_over_lemming:
 
@@ -326,14 +308,16 @@ make_stopper:
 	beq	cant_stop
 	cmp	#LEMMING_FALLING		; can't stop if falling
 	beq	cant_stop
+	cmp	#LEMMING_STOPPING		; an unmoving object can't be
+	beq	cant_stop			; stopped!
 
 	lda	#LEMMING_STOPPING
 	sta	lemming_status,Y
 
 	; put line on page2 to make lemmings reverse
 
-;	 line from (x,a) to (x,a+y)
-	lda	#$7f
+	; line from (x,a) to (x,a+y)
+	lda	#$7
 	sta	HGR_COLOR
 
 	jsr	hgr_vlin_page_toggle
@@ -344,10 +328,14 @@ make_stopper:
 	adc	lemming_x,Y
 	asl
 	adc	lemming_x,Y
+	adc	#2			; center a bit
 
 	tax
 	lda	lemming_y,Y
-	ldy	#10
+	clc
+	adc	#3
+
+	ldy	#7
 
 	jsr	hgr_vlin
 
diff --git a/games/lemm/lemm.s b/games/lemm/lemm.s
index 5736385b..9ed4f06f 100644
--- a/games/lemm/lemm.s
+++ b/games/lemm/lemm.s
@@ -296,7 +296,7 @@ level_won:
 	inc	WHICH_LEVEL
 
 	lda	WHICH_LEVEL
-	cmp	#7
+	cmp	#11
 	bcc	level_continue
 
 	lda	#1			; wrap to level1?
diff --git a/games/lemm/level8.s b/games/lemm/level8.s
index 031079c8..2feb9901 100644
--- a/games/lemm/level8.s
+++ b/games/lemm/level8.s
@@ -39,7 +39,7 @@ do_level8:
 
 	lda	#9			;
 	sta	exit_x1_smc+1
-	lda	#13
+	lda	#14
 	sta	exit_x2_smc+1
 
 	lda	#112