diff --git a/games/lemm/NOTES b/games/lemm/NOTES
index 97bd81fa..e5b52007 100644
--- a/games/lemm/NOTES
+++ b/games/lemm/NOTES
@@ -1,3 +1,11 @@
+Implementation details:
+	+ stoppers have special $10 line behind them
+		has to be special so climbers can't treat it as wall
+		and climb
+	+ bridge is solid $FF color.  Allow things to walk through this,
+		so shouldn't allow backgrounds to have this pattern
+
+
 Plan for future scrolling:
 	+ Foreground drawn with a tilemap
 		Write program to pick optimal tiles
diff --git a/games/lemm/TODO b/games/lemm/TODO
index 392fd270..8e7862a6 100644
--- a/games/lemm/TODO
+++ b/games/lemm/TODO
@@ -1,10 +1,8 @@
+cheat button
+fix climbers hitting ceiling
 Bubbles on L4
 Hook up exit L5
-
-
-+ special case
-	no collision with all-white frames (allow walking through bridges)
-	no climbing on spikes
+proper off-screen handling
 + have bridge stop building when hits wall
 	(real game, reverses too maybe?)
 
@@ -21,16 +19,11 @@ Hook up exit L5
 	even x, maybe we should start animation 4 frames in if that's
 	the case.  Or maybe it's the shift for odd frames, make
 	the shift the other way if walking left/right
-+ Add climber
-+ Add builder
 + Make particles thicker?  Look fine, not show up in recordings
 + Erase particles as last step
 
-+ when nuke, they should stop coming out of the door
 + offset the frames when nuking so not simultaneous
 + on explosion, start with invisible 6 so we always get a full 5s
 
-+ nuke/exploding should not happen if lemming is splatting
-	or already exploding
 + green flame for ice level?
 
diff --git a/games/lemm/hgr_partial_restore.s b/games/lemm/hgr_partial_restore.s
index 6d28f064..a950513b 100644
--- a/games/lemm/hgr_partial_restore.s
+++ b/games/lemm/hgr_partial_restore.s
@@ -12,6 +12,8 @@ hgr_partial_restore:
 	stx	partial_restore_x2_smc+1
 
 	ldx	SAVED_Y2
+	bpl	partial_restore_yloop
+	ldx	#0
 
 partial_restore_yloop:
 
@@ -40,6 +42,6 @@ partial_restore_x1_smc:
 
 	dex
 	cpx	SAVED_Y1
-	bcs	partial_restore_yloop	; bge
+	bpl	partial_restore_yloop	; urgh bcs gets stuck
 
 	rts
diff --git a/games/lemm/move_lemming.s b/games/lemm/move_lemming.s
index 7d97a6f9..2d54bee9 100644
--- a/games/lemm/move_lemming.s
+++ b/games/lemm/move_lemming.s
@@ -595,9 +595,12 @@ do_lemming_climbing:
 
 not_done_climbing:
 	jsr	collision_check_ceiling
+	bcs	done_climbing		; carry set we hit ceiling
+					; don't check pullup then
 
 	jsr	collision_check_above
 
+done_climbing:
 	jmp	done_move_lemming
 
 
@@ -813,9 +816,11 @@ hit_head:
 
 	lda	#LEMMING_FALLING
 	sta	lemming_status,Y
+	sec
+	rts
 
 done_check_ceiling:
-
+	clc
 	rts