diff --git a/D43P01.ini b/D43P01.ini
index 52635eee27..6b75ed92a9 100644
--- a/D43P01.ini
+++ b/D43P01.ini
@@ -1,10 +1,4 @@
-# D43P01 - The Legend of Zelda: Ocarina of Time

-

-[EmuState]
+# D43P01 - The Legend of Zelda: Ocarina of Time[EmuState]
 #The Emulation State.
 EmulationStateId = 1
-[OnFrame]

-#Add memory patches here.

-

-[ActionReplay]

-#Add decrypted action replay cheats here.

+[OnFrame]#Add memory patches here.Issues="Boots then hangs, stuck on nop opcode?"[ActionReplay]#Add decrypted action replay cheats here.
\ No newline at end of file
diff --git a/G2ME01.ini b/G2ME01.ini
index b1cae06112..5384acc017 100644
--- a/G2ME01.ini
+++ b/G2ME01.ini
@@ -2,6 +2,7 @@
 [EmuState]
 #The Emulation State.
 EmulationStateId = 2
+Issues="Scanner does not work, music is buggy, scanner mode is buggy"
 [Speedhacks]
 0x803758bc=400
 [OnFrame]
diff --git a/G2MP01.ini b/G2MP01.ini
index cbc5893913..56b271aa86 100644
--- a/G2MP01.ini
+++ b/G2MP01.ini
@@ -1,13 +1,8 @@
-# G2MP01 - Metroid Prime 2 Echoes

-[EmuState]
+# G2MP01 - Metroid Prime 2 Echoes[EmuState]
 #The Emulation State.
 EmulationStateId = 2
+Issues="Scanner does not work, music is buggy, scanner mode is buggy"
 [Speedhacks]
 #Patch OSYieldThread to take more time - MP2's idle loop is really stupid.
-0x80375c68=400

-[OnFrame]

-#Add memory patches here.

-#0x80000020=twgt:0xE5207C22
-#0x80000008=word:0x01000000

-[ActionReplay]

-#Add decrypted action replay cheats here.

+0x80375c68=400[OnFrame]#Add memory patches here.#0x80000020=twgt:0xE5207C22
+#0x80000008=word:0x01000000[ActionReplay]#Add decrypted action replay cheats here.
\ No newline at end of file
diff --git a/UGPP01.ini b/UGPP01.ini
index f79f884c29..23c61121f4 100644
--- a/UGPP01.ini
+++ b/UGPP01.ini
@@ -1,8 +1,4 @@
-# UGPP01 - Game Boy Player Start-up Disc for EUR
-[Core]
-#Values set here will override the main dolphin settings.
-[EmuState]
-#The Emulation State. 1 is worst, 5 is best, 0 is not set.
+# UGPP01 - GAME BOY PLAYER[EmuState]
+#The Emulation State.
 EmulationStateId = 0
-[OnFrame]
-[ActionReplay]
+[OnFrame]#Add memory patches here.[ActionReplay]
\ No newline at end of file