diff --git a/D43P01.ini b/D43P01.ini
index 6b75ed92a9..551ec18168 100644
--- a/D43P01.ini
+++ b/D43P01.ini
@@ -1,4 +1,7 @@
-# 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.Issues="Boots then hangs, stuck on nop opcode?"[ActionReplay]#Add decrypted action replay cheats here.
\ No newline at end of file
+Issues="Boots then hangs, stuck on nop opcode?"
+[OnFrame]#Add memory patches here.
+[ActionReplay]#Add decrypted action replay cheats here.
\ No newline at end of file
diff --git a/GLME01.ini b/GLME01.ini
index 3159d2ea99..b13eed2259 100644
--- a/GLME01.ini
+++ b/GLME01.ini
@@ -2,6 +2,7 @@
 [EmuState]
 #The Emulation State.
 EmulationStateId = 4
+Issues="Some controls may not work correctly"
 [OnFrame]
 #Add memory patches here.
 [ActionReplay]
diff --git a/GM4E01.ini b/GM4E01.ini
index 5442c12811..2880c9a311 100644
--- a/GM4E01.ini
+++ b/GM4E01.ini
@@ -2,6 +2,7 @@
 [EmuState]
 #The Emulation State.
 EmulationStateId = 2
+Issues="Going to next course may hang"
 [OnFrame] 
 #Add memory patches here.  
 [ActionReplay] 
diff --git a/GM4P01.ini b/GM4P01.ini
index ae42a099ea..e11f99601b 100644
--- a/GM4P01.ini
+++ b/GM4P01.ini
@@ -1,14 +1,9 @@
-# GM4P01 - Mario Kart: Double Dash!!

-[EmuState]
+# GM4P01 - Mario Kart: Double Dash!![EmuState]
 #The Emulation State.
 EmulationStateId = 4
-

-[OnFrame]

-#Add memory patches here.

-

-[ActionReplay]

-#Add decrypted action replay cheats here.

-$(M)
+Issues="Going to next course may hang"
+[OnFrame]#Add memory patches here.
+[ActionReplay]#Add decrypted action replay cheats here.$(M)
 044C2F9A 98000000
 C41D289C 0000FF00
 
diff --git a/GM8E01.ini b/GM8E01.ini
index 2dd2ae6173..f0fd5d56b9 100644
--- a/GM8E01.ini
+++ b/GM8E01.ini
@@ -2,6 +2,7 @@
 [EmuState]
 #The Emulation State.
 EmulationStateId = 3
+Issues="Heat Visor doesn't work correctly, some graphics bugs, boss music doesn't play"
 [Speedhacks]
 0x80384b1c=400
 [OnFrame] 
diff --git a/GM8J01.ini b/GM8J01.ini
index de3e498948..90e6cf2743 100644
--- a/GM8J01.ini
+++ b/GM8J01.ini
@@ -6,6 +6,7 @@
 [EmuState]
 #The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 2
+Issues="Heat Visor doesn't work correctly, some graphics bugs, boss music doesn't play"
 [OnFrame]
 #Add memory patches to be applied every frame here.
 [ActionReplay]
diff --git a/GM8P01.ini b/GM8P01.ini
index 45e69aae2d..0a5e8eac9a 100644
--- a/GM8P01.ini
+++ b/GM8P01.ini
@@ -1,15 +1,10 @@
-# GM8P01 - Metroid Prime

-
+# GM8P01 - Metroid Prime
 [Core]
 #Values set here will override the main dolphin settings.
 [Speedhacks]
 # Patch OSYieldThread to take more time - MP1's idle loop is really stupid.
-0x8036eba0=400

-[EmuState]
+0x8036eba0=400[EmuState]
 #The Emulation State.
 EmulationStateId = 2
-[OnFrame]

-#Add memory patches here.

-

-[ActionReplay]

-#Add decrypted action replay cheats here.

+Issues="Heat Visor doesn't work correctly, some graphics bugs, boss music doesn't play, PAL problems"
+[OnFrame]#Add memory patches here.[ActionReplay]#Add decrypted action replay cheats here.
\ No newline at end of file
diff --git a/GMPE01.ini b/GMPE01.ini
index d0ff35dbcc..297bc69aa5 100644
--- a/GMPE01.ini
+++ b/GMPE01.ini
@@ -2,6 +2,7 @@
 [EmuState]
 #The Emulation State.
 EmulationStateId = 4
+Issues="The bubbles in into scene when starting a game are not shaded right?"
 [OnFrame]
 #Add memory patches here.
 
diff --git a/GP5E01.ini b/GP5E01.ini
index 4d09748d26..c67ed7c7a7 100644
--- a/GP5E01.ini
+++ b/GP5E01.ini
@@ -2,6 +2,7 @@
 [EmuState]
 #The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 0
+Issues="Some graphical bugs"
 [OnLoad]
 #Add memory patches to be loaded once on boot here.
 [OnFrame]
diff --git a/GZ2E01.ini b/GZ2E01.ini
index 38529ac0ca..243f5162bb 100644
--- a/GZ2E01.ini
+++ b/GZ2E01.ini
@@ -2,6 +2,7 @@
 [EmuState]
 #The Emulation State.
 EmulationStateId = 2
+Issues="low FPS in big areas, no working sound"
 [OnFrame]
 #Add memory patches here.
 [ActionReplay]
diff --git a/GZ2P01.ini b/GZ2P01.ini
index 652751cf65..5e7a82c7a4 100644
--- a/GZ2P01.ini
+++ b/GZ2P01.ini
@@ -6,6 +6,7 @@
 [EmuState]
 #The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 2
+Issues="low FPS in big areas, no working sound"
 [OnFrame]
 [ActionReplay]
 $(M)
diff --git a/RM3P01.ini b/RM3P01.ini
index e9f89b096d..d8d716d57d 100644
--- a/RM3P01.ini
+++ b/RM3P01.ini
@@ -6,5 +6,6 @@
 [EmuState]
 #The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 0
+Issues="No working scanner"
 [OnFrame]
 [ActionReplay]
\ No newline at end of file
diff --git a/UGPP01.ini b/UGPP01.ini
index 23c61121f4..ba603f6629 100644
--- a/UGPP01.ini
+++ b/UGPP01.ini
@@ -1,4 +1,6 @@
-# UGPP01 - GAME BOY PLAYER[EmuState]
-#The Emulation State.
+# UGPP01 - GAME BOY PLAYER
+[EmuState]
 EmulationStateId = 0
-[OnFrame]#Add memory patches here.[ActionReplay]
\ No newline at end of file
+Issues="The game needs the GBA Player hardware attachment"
+[OnFrame]
+[ActionReplay]
\ No newline at end of file