diff --git a/gamemanager.s b/gamemanager.s
index a199e30..30f9cc8 100644
--- a/gamemanager.s
+++ b/gamemanager.s
@@ -243,15 +243,12 @@ trackActiveShotDone:
 ; Handles changing the active player
 ;
 endTurn:
-	lda #0			; HAAAAX
+	lda currentPlayer
+	inc
+	cmp #NUMPLAYERS
+	beq endTurnWrap
 	sta currentPlayer
 
-;	lda currentPlayer
-;	inc
-;	cmp #NUMPLAYERS
-;	beq endTurnWrap
-;	sta currentPlayer
-
 endTurnRefresh:
 	jsr processTurnForProjectiles
 
diff --git a/gameobject.s b/gameobject.s
index 65e3b02..253923e 100644
--- a/gameobject.s
+++ b/gameobject.s
@@ -437,8 +437,8 @@ unrenderGameObject:
 
 	; Find gameobject location in video memory
 	jsr vramPtr
-	cpx #0
-	bmi unrenderGameobjectSkip
+	cpx #$ffff
+	beq unrenderGameobjectSkip
 	bra unrenderGameobjectBackground
 
 unrenderGameobjectSkip:
diff --git a/gscats.2mg b/gscats.2mg
index e0960e9..3a0f349 100644
Binary files a/gscats.2mg and b/gscats.2mg differ
diff --git a/player.s b/player.s
index 92be593..7a9d4e9 100644
--- a/player.s
+++ b/player.s
@@ -278,8 +278,8 @@ protectPlayers:
 	lda #playerData
 	sta PARAML0
 	jsr vramPtr
-	cpx #0
-	bmi protectPlayerNext
+	cpx #$ffff
+	beq protectPlayerNext
 
 	lda #playerData+GO_BACKGROUND
 	sta PARAML0
@@ -289,8 +289,8 @@ protectPlayerNext:
 	lda #playerData+PD_SIZE
 	sta PARAML0
 	jsr vramPtr
-	cpx #0
-	bmi protectPlayerDone
+	cpx #$ffff
+	beq protectPlayerDone
 
 	lda #playerData+GO_BACKGROUND+PD_SIZE
 	sta PARAML0
diff --git a/projectile.s b/projectile.s
index 9dd8dee..447b747 100644
--- a/projectile.s
+++ b/projectile.s
@@ -670,7 +670,7 @@ protectProjectilesGotOne:
 	sta PARAML0
 	phx
 	jsr vramPtr
-	cpx #-1
+	cpx #$ffff
 	beq protectProjectilesOffscreen
 
 	lda #projectileData+GO_BACKGROUND