diff --git a/constants/trainer_constants.asm b/constants/trainer_constants.asm
index 6c4cac3..4005b1f 100644
--- a/constants/trainer_constants.asm
+++ b/constants/trainer_constants.asm
@@ -48,6 +48,7 @@ ENDM
 ; KHALID - Arab boy's name
 ; OSAMA - Arab boy's name
 ; ABDUL - Arab boy's name. On its own this can mean a large number of things, but it's also a JoJo reference!
+; OMAR - Arab boy's name.
 ; YANG - 杨 Mandarin name
 ; ZHAO - 赵 Mandarin name
 ; ZHOU - 周 Mandarin name
@@ -60,6 +61,14 @@ ENDM
 ; HAYUN - Korean girl's name
 ; ISEO - Korean girl's name
 ; JIA - Mandarin/Korean girl's name
+; TERESA - Spanish girl's name
+; AELFGAR - Old English male name.
+; BRECA - Beowulf character, Old English name
+; CHAUCER - Middle English / French surname
+; GARMUND - Beowulf character, Old English name
+; GRENDEL - Beowulf character, Old English name, major villain
+; HROTHGAR - Beowulf character, Old English name, king of Denmark
+; FRODA - Beowulf character, Old English name
 
 ; trainer class ids
 ; `trainerclass` indexes are for:
diff --git a/data/trainers/parties.asm b/data/trainers/parties.asm
index b58d013..bb42bb4 100644
--- a/data/trainers/parties.asm
+++ b/data/trainers/parties.asm
@@ -40,19 +40,20 @@ WhitneyGroup:
 
 BugsyGroup:
 	next_list_item ; BUGSY (1)
-	db "BUGSY@", TRAINERTYPE_MOVES
+	db "BUGSY@", TRAINERTYPE_MOVES ; Concerns: Does this make the Chikorita playthrough too difficult?
 	db 14
-	dw KAKUNA ; Keeps the organic "Bugsy is researching how cocoon Pokemon keep their moves" thing
-	dw POISON_STING, STRING_SHOT, HARDEN, NO_MOVE
+	dw PUPAL ; Keeps the organic "Bugsy is researching how cocoon Pokemon keep their moves" thing
+	dw LEECH_LIFE, STRING_SHOT, HARDEN, NO_MOVE ; We use Pupal because it has Bug STAB, thus serving Bugsy better.
 	db 14
 	dw YANMA
-	dw LEECH_LIFE, FORESIGHT, QUICK_ATTACK, DOUBLE_TEAM
+	dw LEECH_LIFE, SONICBOOM, QUICK_ATTACK, DOUBLE_TEAM
+	db 14
+	dw ARIADOS ; Underlevelled Ariados. TO TEST - Is this too strong? Very low BP moves save for Bite should justify it.
+	dw POISON_STING, CONSTRICT, SCARY_FACE, BITE
 	db 16
 	dw SCYTHER
 	dw QUICK_ATTACK, LEER, FURY_CUTTER, NO_MOVE
 	db -1 ; end
-	; Potential revision: Underlevelled Ariados? Test further.
-	; Also - This makes the Chikorita playthrough harder. Test?
 
 	end_list_items
 
@@ -402,7 +403,7 @@ PokemonProfGroup:
 	dw EARTHQUAKE, ICE_BEAM, THUNDERBOLT, LOVELY_KISS
 	db 60
 	dw TAUROS
-	dw BODY_SLAM, HYPER_BEAM, EARTHQUAKE, BLIZZARD ; Iconic King of Gen 1 set to represent Oak's aging. 
+	dw BODY_SLAM, HYPER_BEAM, EARTHQUAKE, BLIZZARD ; Iconic King of Gen 1 set to represent Oak's aging. Timely, as it was in NC97 previously.
 	db -1 ; end
 
 	end_list_items
@@ -4856,7 +4857,7 @@ CamperGroup:
 	db 32 ; It seems the devs realised they messed up this area and fixed it real quick
 	dw FEAROW
 	db 32
-	dw PRIMEAPE ; ANNIHILAPE??
+	dw PRIMEAPE ; ANNIHILAPE?
 	db 34
 	dw TAUROS
 	db -1 ; end