diff --git a/dist/info/example b/dist/info/00_example_libretro.info
similarity index 90%
rename from dist/info/example
rename to dist/info/00_example_libretro.info
index 88a853b6..95ba6136 100644
--- a/dist/info/example
+++ b/dist/info/00_example_libretro.info
@@ -39,8 +39,8 @@
 # The number of mandatory/optional firmware files the core needs:
 # firmware_count = 7
 
-# Firmware entries should be named from 0 
-# Firmware description 
+# Firmware entries should be named from 0
+# Firmware description
 # firmware0_desc = "filename (Description)" ex: firmware0_desc = "bios.gg (GameGear BIOS)"
 # Firmware path
 # firmware0_path = "filename.ext"  ex: firmware0_path = "bios.gg"
@@ -48,4 +48,4 @@
 # firmware0_opt = "true/false"
 
 # Additional notes:
-#notes = "note1|note2|note3 with spaces|note 4 with spaces|note 5 (test)|note6"
+#notes = "(!) hash|(!) game rom|(^) continue|[1] notes|[^] continue|[*] list"
diff --git a/dist/info/2048_libretro.info b/dist/info/2048_libretro.info
index fc721a14..de5f33b5 100644
--- a/dist/info/2048_libretro.info
+++ b/dist/info/2048_libretro.info
@@ -3,8 +3,8 @@ authors = "Gabriele Cirulli"
 supported_extensions = ""
 corename = "2048"
 categories = "Game"
-systemname = "2048 game clone"
-license = "GPLv3"
+systemname = "2048 Game Clone"
+license = "Public Domain"
 permissions = ""
 display_version = "1.0"
 supports_no_game = "true"
diff --git a/dist/info/4do_libretro.info b/dist/info/4do_libretro.info
index b7c7066d..ac630741 100644
--- a/dist/info/4do_libretro.info
+++ b/dist/info/4do_libretro.info
@@ -6,7 +6,7 @@ manufacturer = "Various"
 categories = "Emulator"
 systemname = "3DO"
 database = "The 3DO Company - 3DO"
-license = "LGPL with additional notes"
+license = "Non-commercial"
 permissions = ""
 display_version = "v1.3.2.3"
 supports_no_game = "false"
@@ -14,4 +14,4 @@ firmware_count = 1
 firmware0_desc = "panafz10.bin (Panasonic FZ-10 BIOS)"
 firmware0_path = "panafz10.bin"
 firmware0_opt = "false"
-notes = "Suggested md5sum:|51f2f43ae2f3508a14d9f56597e2d3ce = panafz10.bin"
+notes = "(!) panafz10.bin (md5): 51f2f43ae2f3508a14d9f56597e2d3ce"
diff --git a/dist/info/81_libretro.info b/dist/info/81_libretro.info
index 4f1ea24b..afccdf05 100644
--- a/dist/info/81_libretro.info
+++ b/dist/info/81_libretro.info
@@ -10,4 +10,4 @@ license = "GPLv3"
 permissions = ""
 display_version = "1.0a"
 supports_no_game = "false"
-notes = "Amstrad have kindly given their permission for the redistribution of their copyrighted material but retain that copyright"
+notes = "[1] Amstrad have kindly given their permission for the redistribution|[^] of their copyrighted material but retain that copyright."
diff --git a/dist/info/atari800_libretro.info b/dist/info/atari800_libretro.info
index 449adf69..c35a15f6 100644
--- a/dist/info/atari800_libretro.info
+++ b/dist/info/atari800_libretro.info
@@ -11,7 +11,7 @@ permissions = ""
 display_version = "3.1.0"
 supports_no_game = "false"
 firmware_count = 1
-firmware0_desc = "5200.rom (Atari 5200 BIOS)"
+firmware0_desc = "5200.rom (5200 BIOS)"
 firmware0_path = "5200.rom"
 firmware0_opt = "false"
-notes = "Suggested md5sum:|281f20ea4320404ec820fb7ec0693b38 = 5200.rom"
+notes = "(!) 5200.rom (md5): 281f20ea4320404ec820fb7ec0693b38"
diff --git a/dist/info/beetle_psx_libretro.info b/dist/info/beetle_psx_libretro.info
index c4ef2d82..50301c84 100644
--- a/dist/info/beetle_psx_libretro.info
+++ b/dist/info/beetle_psx_libretro.info
@@ -20,4 +20,4 @@ firmware1_opt = "false"
 firmware2_desc = "scph5502.bin (PS1 EU BIOS)"
 firmware2_path = "scph5502.bin"
 firmware2_opt = "false"
-notes = "Suggested md5sums:|8dd7d5296a650fac7319bce665a6a53c = scph5500.bin|490f666e1afb15b7362b406ed1cea246 = scph5501.bin|32736f17079d0b2b7024407c39bd3050 = scph5502.bin"
+notes = "(!) scph5500.bin (md5): 8dd7d5296a650fac7319bce665a6a53c|(!) scph5501.bin (md5): 490f666e1afb15b7362b406ed1cea246|(!) scph5502.bin (md5): 32736f17079d0b2b7024407c39bd3050"
diff --git a/dist/info/bluemsx_libretro.info b/dist/info/bluemsx_libretro.info
index 9ddafbb6..aa4c1b13 100644
--- a/dist/info/bluemsx_libretro.info
+++ b/dist/info/bluemsx_libretro.info
@@ -1,7 +1,7 @@
-display_name = "MSX/SVI/ColecoVision/SG-1000 (blueMSX)"
+display_name = "MSX/SVI/ColecoVision/SG-1000 (BlueMSX)"
 authors = "Daniel Vik"
 supported_extensions = "rom|ri|mx1|mx2|col|sg|sc"
-corename = "blueMSX"
+corename = "BlueMSX"
 manufacturer = "Various"
 categories = "Emulator"
 systemname = "MSX/SVI/ColecoVision/SG-1000"
@@ -10,4 +10,4 @@ license = "GPLv2"
 permissions = ""
 display_version = "SVN"
 supports_no_game = "false"
-notes = "- BIOS files go into the System\Machines folder"
+notes = "(!) The libretro port of blueMSX requires the BIOS files|(^) from full standalone package inside the 'System\Machines' directory."
diff --git a/dist/info/bsnes_accuracy_libretro.info b/dist/info/bsnes_accuracy_libretro.info
index 98b7b4cc..60bbc291 100644
--- a/dist/info/bsnes_accuracy_libretro.info
+++ b/dist/info/bsnes_accuracy_libretro.info
@@ -11,58 +11,58 @@ permissions = ""
 display_version = "v094 (Accuracy)"
 supports_no_game = "false"
 firmware_count = 18
-firmware0_desc = "dsp1.data.rom (DSP1 DATA)"
+firmware0_desc = "dsp1.data.rom"
 firmware0_path = "dsp1.data.rom"
 firmware0_opt = "true"
-firmware1_desc = "dsp1.program.rom (DSP1 PROGRAM)"
+firmware1_desc = "dsp1.program.rom"
 firmware1_path = "dsp1.program.rom"
 firmware1_opt = "true"
-firmware2_desc = "dsp1b.data.rom (DSP1B DATA)"
+firmware2_desc = "dsp1b.data.rom"
 firmware2_path = "dsp1b.data.rom"
 firmware2_opt = "true"
-firmware3_desc = "dsp1b.program.rom (DSP1B PROGRAM)"
+firmware3_desc = "dsp1b.program.rom"
 firmware3_path = "dsp1b.program.rom"
 firmware3_opt = "true"
-firmware4_desc = "dsp2.data.rom (DSP2 DATA)"
+firmware4_desc = "dsp2.data.rom"
 firmware4_path = "dsp2.data.rom"
 firmware4_opt = "true"
-firmware5_desc = "dsp2.program.rom (DSP2 PROGRAM)"
+firmware5_desc = "dsp2.program.rom"
 firmware5_path = "dsp2.program.rom"
 firmware5_opt = "true"
-firmware6_desc = "dsp3.data.rom (DSP3 DATA)"
+firmware6_desc = "dsp3.data.rom"
 firmware6_path = "dsp3.data.rom"
 firmware6_opt = "true"
-firmware7_desc = "dsp3.program.rom (DSP3 PROGRAM)"
+firmware7_desc = "dsp3.program.rom"
 firmware7_path = "dsp3.program.rom"
 firmware7_opt = "true"
-firmware8_desc = "dsp4.data.rom (DSP4 DATA)"
+firmware8_desc = "dsp4.data.rom"
 firmware8_path = "dsp4.data.rom"
 firmware8_opt = "true"
-firmware9_desc = "dsp4.program.rom (DSP4 PROGRAM)"
+firmware9_desc = "dsp4.program.rom"
 firmware9_path = "dsp4.program.rom"
 firmware9_opt = "true"
-firmware10_desc = "cx4.data.rom (Cx4 DATA)"
+firmware10_desc = "cx4.data.rom"
 firmware10_path = "cx4.data.rom"
 firmware10_opt = "true"
-firmware11_desc = "st010.data.rom (ST-0010 DATA)"
+firmware11_desc = "st010.data.rom"
 firmware11_path = "st010.data.rom"
 firmware11_opt = "true"
-firmware12_desc = "st010.program.rom (ST-0010 PROGRAM)"
+firmware12_desc = "st010.program.rom"
 firmware12_path = "st010.program.rom"
 firmware12_opt = "true"
-firmware13_desc = "st011.data.rom (ST-0011 DATA)"
+firmware13_desc = "st011.data.rom"
 firmware13_path = "st011.data.rom"
 firmware13_opt = "true"
-firmware14_desc = "st011.program.rom (ST-0011 PROGRAM)"
+firmware14_desc = "st011.program.rom"
 firmware14_path = "st011.program.rom"
 firmware14_opt = "true"
-firmware15_desc = "st018.data.rom (ST-0018 DATA)"
+firmware15_desc = "st018.data.rom"
 firmware15_path = "st018.data.rom"
 firmware15_opt = "true"
-firmware16_desc = "st018.program.rom (ST-0018 PROGRAM)"
+firmware16_desc = "st018.program.rom"
 firmware16_path = "st018.program.rom"
 firmware16_opt = "true"
-firmware17_desc = "sgb.boot.rom (SGB BOOT)"
+firmware17_desc = "sgb.boot.rom (SGB Boot Image)"
 firmware17_path = "sgb.boot.rom"
 firmware17_opt = "true"
-notes = "- core uses split ROMS for special chip games|- notable DSP1/DSP1B games: Super Mario Kart / Pilotwings|- notable DSP2 games: Dungeon Master|- notable DSP3 games: SD Gundam GX|- notable DSP4 games: Top Gear 3000|- notable Cx4 games: Mega Man X2 / Mega Man X3|- sgb emulation only works from command line"
+notes = "[1] bsnes/higan Accuracy uses split ROMS for special chip games.|[*] Notable DSP1/DSP1B Games: Super Mario Kart,  Pilotwings|[*] Notable DSP2 Games: Dungeon Master|[*] Notable DSP3 Games: SD Gundam GX|[*] Notable DSP4 Games: Top Gear 3000|[*] Notable Cx4 Games: Mega Man X2,  Mega Man X3|[2] SGB Emulation will only work with command line."
diff --git a/dist/info/bsnes_balanced_libretro.info b/dist/info/bsnes_balanced_libretro.info
index 802acbe1..9de87a06 100644
--- a/dist/info/bsnes_balanced_libretro.info
+++ b/dist/info/bsnes_balanced_libretro.info
@@ -11,58 +11,58 @@ permissions = ""
 display_version = "v094 (Balanced)"
 supports_no_game = "false"
 firmware_count = 18
-firmware0_desc = "dsp1.data.rom (DSP1 DATA)"
+firmware0_desc = "dsp1.data.rom"
 firmware0_path = "dsp1.data.rom"
 firmware0_opt = "true"
-firmware1_desc = "dsp1.program.rom (DSP1 PROGRAM)"
+firmware1_desc = "dsp1.program.rom"
 firmware1_path = "dsp1.program.rom"
 firmware1_opt = "true"
-firmware2_desc = "dsp1b.data.rom (DSP1B DATA)"
+firmware2_desc = "dsp1b.data.rom"
 firmware2_path = "dsp1b.data.rom"
 firmware2_opt = "true"
-firmware3_desc = "dsp1b.program.rom (DSP1B PROGRAM)"
+firmware3_desc = "dsp1b.program.rom"
 firmware3_path = "dsp1b.program.rom"
 firmware3_opt = "true"
-firmware4_desc = "dsp2.data.rom (DSP2 DATA)"
+firmware4_desc = "dsp2.data.rom"
 firmware4_path = "dsp2.data.rom"
 firmware4_opt = "true"
-firmware5_desc = "dsp2.program.rom (DSP2 PROGRAM)"
+firmware5_desc = "dsp2.program.rom"
 firmware5_path = "dsp2.program.rom"
 firmware5_opt = "true"
-firmware6_desc = "dsp3.data.rom (DSP3 DATA)"
+firmware6_desc = "dsp3.data.rom"
 firmware6_path = "dsp3.data.rom"
 firmware6_opt = "true"
-firmware7_desc = "dsp3.program.rom (DSP3 PROGRAM)"
+firmware7_desc = "dsp3.program.rom"
 firmware7_path = "dsp3.program.rom"
 firmware7_opt = "true"
-firmware8_desc = "dsp4.data.rom (DSP4 DATA)"
+firmware8_desc = "dsp4.data.rom"
 firmware8_path = "dsp4.data.rom"
 firmware8_opt = "true"
-firmware9_desc = "dsp4.program.rom (DSP4 PROGRAM)"
+firmware9_desc = "dsp4.program.rom"
 firmware9_path = "dsp4.program.rom"
 firmware9_opt = "true"
-firmware10_desc = "cx4.data.rom (Cx4 DATA)"
+firmware10_desc = "cx4.data.rom"
 firmware10_path = "cx4.data.rom"
 firmware10_opt = "true"
-firmware11_desc = "st010.data.rom (ST-0010 DATA)"
+firmware11_desc = "st010.data.rom"
 firmware11_path = "st010.data.rom"
 firmware11_opt = "true"
-firmware12_desc = "st010.program.rom (ST-0010 PROGRAM)"
+firmware12_desc = "st010.program.rom"
 firmware12_path = "st010.program.rom"
 firmware12_opt = "true"
-firmware13_desc = "st011.data.rom (ST-0011 DATA)"
+firmware13_desc = "st011.data.rom"
 firmware13_path = "st011.data.rom"
 firmware13_opt = "true"
-firmware14_desc = "st011.program.rom (ST-0011 PROGRAM)"
+firmware14_desc = "st011.program.rom"
 firmware14_path = "st011.program.rom"
 firmware14_opt = "true"
-firmware15_desc = "st018.data.rom (ST-0018 DATA)"
+firmware15_desc = "st018.data.rom"
 firmware15_path = "st018.data.rom"
 firmware15_opt = "true"
-firmware16_desc = "st018.program.rom (ST-0018 PROGRAM)"
+firmware16_desc = "st018.program.rom"
 firmware16_path = "st018.program.rom"
 firmware16_opt = "true"
-firmware17_desc = "sgb.boot.rom (SGB BOOT)"
+firmware17_desc = "sgb.boot.rom (SGB Boot Image)"
 firmware17_path = "sgb.boot.rom"
 firmware17_opt = "true"
-notes = "- core uses split ROMS for special chip games|- notable DSP1/DSP1B games: Super Mario Kart / Pilotwings|- notable DSP2 games: Dungeon Master|- notable DSP3 games: SD Gundam GX|- notable DSP4 games: Top Gear 3000|- notable Cx4 games: Mega Man X2 / Mega Man X3|- sgb emulation only works from command line"
+notes = "[1] bsnes/higan Balanced uses split ROMS for special chip games.|[*] Notable DSP1/DSP1B Games: Super Mario Kart,  Pilotwings|[*] Notable DSP2 Games: Dungeon Master|[*] Notable DSP3 Games: SD Gundam GX|[*] Notable DSP4 Games: Top Gear 3000|[*] Notable Cx4 Games: Mega Man X2,  Mega Man X3|[2] SGB Emulation will only work with command line."
diff --git a/dist/info/bsnes_mercury_accuracy_libretro.info b/dist/info/bsnes_mercury_accuracy_libretro.info
index d0f3f49e..3550ba29 100644
--- a/dist/info/bsnes_mercury_accuracy_libretro.info
+++ b/dist/info/bsnes_mercury_accuracy_libretro.info
@@ -1,7 +1,7 @@
-display_name = "SNES / Super Famicom (bsnes-mercury Accuracy)"
+display_name = "SNES / Super Famicom (bSNES Mercury Accuracy)"
 authors = "byuu|Alcaro"
 supported_extensions = "sfc|smc|bml"
-corename = "bsnes-mercury Accuracy"
+corename = "bSNES Mercury Accuracy"
 manufacturer = "Nintendo"
 categories = "Emulator"
 systemname = "Super Nintendo Entertainment System"
@@ -11,58 +11,58 @@ permissions = ""
 display_version = "v094 (Mercury Accuracy)"
 supports_no_game = "false"
 firmware_count = 18
-firmware0_desc = "dsp1.data.rom (DSP1 DATA)"
+firmware0_desc = "dsp1.data.rom"
 firmware0_path = "dsp1.data.rom"
 firmware0_opt = "true"
-firmware1_desc = "dsp1.program.rom (DSP1 PROGRAM)"
+firmware1_desc = "dsp1.program.rom"
 firmware1_path = "dsp1.program.rom"
 firmware1_opt = "true"
-firmware2_desc = "dsp1b.data.rom (DSP1B DATA)"
+firmware2_desc = "dsp1b.data.rom"
 firmware2_path = "dsp1b.data.rom"
 firmware2_opt = "true"
-firmware3_desc = "dsp1b.program.rom (DSP1B PROGRAM)"
+firmware3_desc = "dsp1b.program.rom"
 firmware3_path = "dsp1b.program.rom"
 firmware3_opt = "true"
-firmware4_desc = "dsp2.data.rom (DSP2 DATA)"
+firmware4_desc = "dsp2.data.rom"
 firmware4_path = "dsp2.data.rom"
 firmware4_opt = "true"
-firmware5_desc = "dsp2.program.rom (DSP2 PROGRAM)"
+firmware5_desc = "dsp2.program.rom"
 firmware5_path = "dsp2.program.rom"
 firmware5_opt = "true"
-firmware6_desc = "dsp3.data.rom (DSP3 DATA)"
+firmware6_desc = "dsp3.data.rom"
 firmware6_path = "dsp3.data.rom"
 firmware6_opt = "true"
-firmware7_desc = "dsp3.program.rom (DSP3 PROGRAM)"
+firmware7_desc = "dsp3.program.rom"
 firmware7_path = "dsp3.program.rom"
 firmware7_opt = "true"
-firmware8_desc = "dsp4.data.rom (DSP4 DATA)"
+firmware8_desc = "dsp4.data.rom"
 firmware8_path = "dsp4.data.rom"
 firmware8_opt = "true"
-firmware9_desc = "dsp4.program.rom (DSP4 PROGRAM)"
+firmware9_desc = "dsp4.program.rom"
 firmware9_path = "dsp4.program.rom"
 firmware9_opt = "true"
-firmware10_desc = "cx4.data.rom (Cx4 DATA)"
+firmware10_desc = "cx4.data.rom"
 firmware10_path = "cx4.data.rom"
 firmware10_opt = "true"
-firmware11_desc = "st010.data.rom (ST-0010 DATA)"
+firmware11_desc = "st010.data.rom"
 firmware11_path = "st010.data.rom"
 firmware11_opt = "true"
-firmware12_desc = "st010.program.rom (ST-0010 PROGRAM)"
+firmware12_desc = "st010.program.rom"
 firmware12_path = "st010.program.rom"
 firmware12_opt = "true"
-firmware13_desc = "st011.data.rom (ST-0011 DATA)"
+firmware13_desc = "st011.data.rom"
 firmware13_path = "st011.data.rom"
 firmware13_opt = "true"
-firmware14_desc = "st011.program.rom (ST-0011 PROGRAM)"
+firmware14_desc = "st011.program.rom"
 firmware14_path = "st011.program.rom"
 firmware14_opt = "true"
-firmware15_desc = "st018.data.rom (ST-0018 DATA)"
+firmware15_desc = "st018.data.rom"
 firmware15_path = "st018.data.rom"
 firmware15_opt = "true"
-firmware16_desc = "st018.program.rom (ST-0018 PROGRAM)"
+firmware16_desc = "st018.program.rom"
 firmware16_path = "st018.program.rom"
 firmware16_opt = "true"
-firmware17_desc = "sgb.boot.rom (SGB BOOT)"
+firmware17_desc = "sgb.boot.rom (SGB Boot Image)"
 firmware17_path = "sgb.boot.rom"
 firmware17_opt = "true"
-notes = "- core uses split ROMS for special chip games|- notable DSP1/DSP1B games: Super Mario Kart / Pilotwings|- notable DSP2 games: Dungeon Master|- notable DSP3 games: SD Gundam GX|- notable DSP4 games: Top Gear 3000|- notable Cx4 games: Mega Man X2 / Mega Man X3|- sgb emulation only works from command line"
+notes = "[1] bsnes-mercury Accuracy uses split ROMS for special chip games.|[*] Notable DSP1/DSP1B Games: Super Mario Kart,  Pilotwings|[*] Notable DSP2 Games: Dungeon Master|[*] Notable DSP3 Games: SD Gundam GX|[*] Notable DSP4 Games: Top Gear 3000|[*] Notable Cx4 Games: Mega Man X2,  Mega Man X3|[2] SGB Emulation will only work with command line."
diff --git a/dist/info/bsnes_mercury_balanced_libretro.info b/dist/info/bsnes_mercury_balanced_libretro.info
index 7f9b23c8..e44df167 100644
--- a/dist/info/bsnes_mercury_balanced_libretro.info
+++ b/dist/info/bsnes_mercury_balanced_libretro.info
@@ -1,7 +1,7 @@
-display_name = "SNES / Super Famicom (bsnes-mercury Balanced)"
+display_name = "SNES / Super Famicom (bSNES Mercury Balanced)"
 authors = "byuu|Alcaro"
 supported_extensions = "sfc|smc|bml"
-corename = "bsnes-mercury Balanced"
+corename = "bSNES Mercury Balanced"
 manufacturer = "Nintendo"
 categories = "Emulator"
 systemname = "Super Nintendo Entertainment System"
@@ -11,58 +11,58 @@ permissions = ""
 display_version = "v094 (Mercury Balanced)"
 supports_no_game = "false"
 firmware_count = 18
-firmware0_desc = "dsp1.data.rom (DSP1 DATA)"
+firmware0_desc = "dsp1.data.rom"
 firmware0_path = "dsp1.data.rom"
 firmware0_opt = "true"
-firmware1_desc = "dsp1.program.rom (DSP1 PROGRAM)"
+firmware1_desc = "dsp1.program.rom"
 firmware1_path = "dsp1.program.rom"
 firmware1_opt = "true"
-firmware2_desc = "dsp1b.data.rom (DSP1B DATA)"
+firmware2_desc = "dsp1b.data.rom"
 firmware2_path = "dsp1b.data.rom"
 firmware2_opt = "true"
-firmware3_desc = "dsp1b.program.rom (DSP1B PROGRAM)"
+firmware3_desc = "dsp1b.program.rom"
 firmware3_path = "dsp1b.program.rom"
 firmware3_opt = "true"
-firmware4_desc = "dsp2.data.rom (DSP2 DATA)"
+firmware4_desc = "dsp2.data.rom"
 firmware4_path = "dsp2.data.rom"
 firmware4_opt = "true"
-firmware5_desc = "dsp2.program.rom (DSP2 PROGRAM)"
+firmware5_desc = "dsp2.program.rom"
 firmware5_path = "dsp2.program.rom"
 firmware5_opt = "true"
-firmware6_desc = "dsp3.data.rom (DSP3 DATA)"
+firmware6_desc = "dsp3.data.rom"
 firmware6_path = "dsp3.data.rom"
 firmware6_opt = "true"
-firmware7_desc = "dsp3.program.rom (DSP3 PROGRAM)"
+firmware7_desc = "dsp3.program.rom"
 firmware7_path = "dsp3.program.rom"
 firmware7_opt = "true"
-firmware8_desc = "dsp4.data.rom (DSP4 DATA)"
+firmware8_desc = "dsp4.data.rom"
 firmware8_path = "dsp4.data.rom"
 firmware8_opt = "true"
-firmware9_desc = "dsp4.program.rom (DSP4 PROGRAM)"
+firmware9_desc = "dsp4.program.rom"
 firmware9_path = "dsp4.program.rom"
 firmware9_opt = "true"
-firmware10_desc = "cx4.data.rom (Cx4 DATA)"
+firmware10_desc = "cx4.data.rom"
 firmware10_path = "cx4.data.rom"
 firmware10_opt = "true"
-firmware11_desc = "st010.data.rom (ST-0010 DATA)"
+firmware11_desc = "st010.data.rom"
 firmware11_path = "st010.data.rom"
 firmware11_opt = "true"
-firmware12_desc = "st010.program.rom (ST-0010 PROGRAM)"
+firmware12_desc = "st010.program.rom"
 firmware12_path = "st010.program.rom"
 firmware12_opt = "true"
-firmware13_desc = "st011.data.rom (ST-0011 DATA)"
+firmware13_desc = "st011.data.rom"
 firmware13_path = "st011.data.rom"
 firmware13_opt = "true"
-firmware14_desc = "st011.program.rom (ST-0011 PROGRAM)"
+firmware14_desc = "st011.program.rom"
 firmware14_path = "st011.program.rom"
 firmware14_opt = "true"
-firmware15_desc = "st018.data.rom (ST-0018 DATA)"
+firmware15_desc = "st018.data.rom"
 firmware15_path = "st018.data.rom"
 firmware15_opt = "true"
-firmware16_desc = "st018.program.rom (ST-0018 PROGRAM)"
+firmware16_desc = "st018.program.rom"
 firmware16_path = "st018.program.rom"
 firmware16_opt = "true"
-firmware17_desc = "sgb.boot.rom (SGB BOOT)"
+firmware17_desc = "sgb.boot.rom (SGB Boot Image)"
 firmware17_path = "sgb.boot.rom"
 firmware17_opt = "true"
-notes = "- core uses split ROMS for special chip games|- notable DSP1/DSP1B games: Super Mario Kart / Pilotwings|- notable DSP2 games: Dungeon Master|- notable DSP3 games: SD Gundam GX|- notable DSP4 games: Top Gear 3000|- notable Cx4 games: Mega Man X2 / Mega Man X3|- sgb emulation only works from command line"
+notes = "[1] bsnes-mercury Balanced uses split ROMS for special chip games.|[*] Notable DSP1/DSP1B Games: Super Mario Kart,  Pilotwings|[*] Notable DSP2 Games: Dungeon Master|[*] Notable DSP3 Games: SD Gundam GX|[*] Notable DSP4 Games: Top Gear 3000|[*] Notable Cx4 Games: Mega Man X2,  Mega Man X3|[2] SGB Emulation will only work with command line."
diff --git a/dist/info/bsnes_mercury_performance_libretro.info b/dist/info/bsnes_mercury_performance_libretro.info
index d2a1b374..d908fec2 100644
--- a/dist/info/bsnes_mercury_performance_libretro.info
+++ b/dist/info/bsnes_mercury_performance_libretro.info
@@ -1,7 +1,7 @@
-display_name = "SNES / Super Famicom (bsnes-mercury Performance)"
+display_name = "SNES / Super Famicom (bSNES Mercury Performance)"
 authors = "byuu|Alcaro"
 supported_extensions = "sfc|smc|bml"
-corename = "bsnes-mercury Performance"
+corename = "bSNES Mercury Performance"
 manufacturer = "Nintendo"
 categories = "Emulator"
 systemname = "Super Nintendo Entertainment System"
@@ -11,55 +11,55 @@ permissions = ""
 display_version = "v094 (Mercury Performance)"
 supports_no_game = "false"
 firmware_count = 17
-firmware0_desc = "dsp1.data.rom (DSP1 DATA)"
+firmware0_desc = "dsp1.data.rom"
 firmware0_path = "dsp1.data.rom"
 firmware0_opt = "true"
-firmware1_desc = "dsp1.program.rom (DSP1 PROGRAM)"
+firmware1_desc = "dsp1.program.rom"
 firmware1_path = "dsp1.program.rom"
 firmware1_opt = "true"
-firmware2_desc = "dsp1b.data.rom (DSP1B DATA)"
+firmware2_desc = "dsp1b.data.rom"
 firmware2_path = "dsp1b.data.rom"
 firmware2_opt = "true"
-firmware3_desc = "dsp1b.program.rom (DSP1B PROGRAM)"
+firmware3_desc = "dsp1b.program.rom"
 firmware3_path = "dsp1b.program.rom"
 firmware3_opt = "true"
-firmware4_desc = "dsp2.data.rom (DSP2 DATA)"
+firmware4_desc = "dsp2.data.rom"
 firmware4_path = "dsp2.data.rom"
 firmware4_opt = "true"
-firmware5_desc = "dsp2.program.rom (DSP2 PROGRAM)"
+firmware5_desc = "dsp2.program.rom"
 firmware5_path = "dsp2.program.rom"
 firmware5_opt = "true"
-firmware6_desc = "dsp3.data.rom (DSP3 DATA)"
+firmware6_desc = "dsp3.data.rom"
 firmware6_path = "dsp3.data.rom"
 firmware6_opt = "true"
-firmware7_desc = "dsp3.program.rom (DSP3 PROGRAM)"
+firmware7_desc = "dsp3.program.rom"
 firmware7_path = "dsp3.program.rom"
 firmware7_opt = "true"
-firmware8_desc = "dsp4.data.rom (DSP4 DATA)"
+firmware8_desc = "dsp4.data.rom"
 firmware8_path = "dsp4.data.rom"
 firmware8_opt = "true"
-firmware9_desc = "dsp4.program.rom (DSP4 PROGRAM)"
+firmware9_desc = "dsp4.program.rom"
 firmware9_path = "dsp4.program.rom"
 firmware9_opt = "true"
-firmware10_desc = "st010.data.rom (ST-0010 DATA)"
+firmware10_desc = "st010.data.rom"
 firmware10_path = "st010.data.rom"
 firmware10_opt = "true"
-firmware11_desc = "st010.program.rom (ST-0010 PROGRAM)"
+firmware11_desc = "st010.program.rom"
 firmware11_path = "st010.program.rom"
 firmware11_opt = "true"
-firmware12_desc = "st011.data.rom (ST-0011 DATA)"
+firmware12_desc = "st011.data.rom"
 firmware12_path = "st011.data.rom"
 firmware12_opt = "true"
-firmware13_desc = "st011.program.rom (ST-0011 PROGRAM)"
+firmware13_desc = "st011.program.rom"
 firmware13_path = "st011.program.rom"
 firmware13_opt = "true"
-firmware14_desc = "st018.data.rom (ST-0018 DATA)"
+firmware14_desc = "st018.data.rom"
 firmware14_path = "st018.data.rom"
 firmware14_opt = "true"
-firmware15_desc = "st018.program.rom (ST-0018 PROGRAM)"
+firmware15_desc = "st018.program.rom"
 firmware15_path = "st018.program.rom"
 firmware15_opt = "true"
-firmware16_desc = "sgb.boot.rom (SGB BOOT)"
+firmware16_desc = "sgb.boot.rom (SGB Boot Image)"
 firmware16_path = "sgb.boot.rom"
 firmware16_opt = "true"
-notes = "- core uses split ROMS for special chip games|- notable DSP1/DSP1B games: Super Mario Kart / Pilotwings|- notable DSP2 games: Dungeon Master|- notable DSP3 games: SD Gundam GX|- notable DSP4 games: Top Gear 3000|- Cx4 emulation broken"
+notes = "[1] bsnes-mercury Performance uses split ROMS for special chip games.|[*] Notable DSP1/DSP1B Games: Super Mario Kart,  Pilotwings|[*] Notable DSP2 Games: Dungeon Master|[*] Notable DSP3 Games: SD Gundam GX|[*] Notable DSP4 Games: Top Gear 3000|[2] Emulation for Cx4 games is broken."
diff --git a/dist/info/bsnes_performance_libretro.info b/dist/info/bsnes_performance_libretro.info
index 8b7ab17c..440d8753 100644
--- a/dist/info/bsnes_performance_libretro.info
+++ b/dist/info/bsnes_performance_libretro.info
@@ -11,55 +11,55 @@ permissions = ""
 display_version = "v094 (Performance)"
 supports_no_game = "false"
 firmware_count = 17
-firmware0_desc = "dsp1.data.rom (DSP1 DATA)"
+firmware0_desc = "dsp1.data.rom"
 firmware0_path = "dsp1.data.rom"
 firmware0_opt = "true"
-firmware1_desc = "dsp1.program.rom (DSP1 PROGRAM)"
+firmware1_desc = "dsp1.program.rom"
 firmware1_path = "dsp1.program.rom"
 firmware1_opt = "true"
-firmware2_desc = "dsp1b.data.rom (DSP1B DATA)"
+firmware2_desc = "dsp1b.data.rom"
 firmware2_path = "dsp1b.data.rom"
 firmware2_opt = "true"
-firmware3_desc = "dsp1b.program.rom (DSP1B PROGRAM)"
+firmware3_desc = "dsp1b.program.rom"
 firmware3_path = "dsp1b.program.rom"
 firmware3_opt = "true"
-firmware4_desc = "dsp2.data.rom (DSP2 DATA)"
+firmware4_desc = "dsp2.data.rom"
 firmware4_path = "dsp2.data.rom"
 firmware4_opt = "true"
-firmware5_desc = "dsp2.program.rom (DSP2 PROGRAM)"
+firmware5_desc = "dsp2.program.rom"
 firmware5_path = "dsp2.program.rom"
 firmware5_opt = "true"
-firmware6_desc = "dsp3.data.rom (DSP3 DATA)"
+firmware6_desc = "dsp3.data.rom"
 firmware6_path = "dsp3.data.rom"
 firmware6_opt = "true"
-firmware7_desc = "dsp3.program.rom (DSP3 PROGRAM)"
+firmware7_desc = "dsp3.program.rom"
 firmware7_path = "dsp3.program.rom"
 firmware7_opt = "true"
-firmware8_desc = "dsp4.data.rom (DSP4 DATA)"
+firmware8_desc = "dsp4.data.rom"
 firmware8_path = "dsp4.data.rom"
 firmware8_opt = "true"
-firmware9_desc = "dsp4.program.rom (DSP4 PROGRAM)"
+firmware9_desc = "dsp4.program.rom"
 firmware9_path = "dsp4.program.rom"
 firmware9_opt = "true"
-firmware10_desc = "st010.data.rom (ST-0010 DATA)"
+firmware10_desc = "st010.data.rom"
 firmware10_path = "st010.data.rom"
 firmware10_opt = "true"
-firmware11_desc = "st010.program.rom (ST-0010 PROGRAM)"
+firmware11_desc = "st010.program.rom"
 firmware11_path = "st010.program.rom"
 firmware11_opt = "true"
-firmware12_desc = "st011.data.rom (ST-0011 DATA)"
+firmware12_desc = "st011.data.rom"
 firmware12_path = "st011.data.rom"
 firmware12_opt = "true"
-firmware13_desc = "st011.program.rom (ST-0011 PROGRAM)"
+firmware13_desc = "st011.program.rom"
 firmware13_path = "st011.program.rom"
 firmware13_opt = "true"
-firmware14_desc = "st018.data.rom (ST-0018 DATA)"
+firmware14_desc = "st018.data.rom"
 firmware14_path = "st018.data.rom"
 firmware14_opt = "true"
-firmware15_desc = "st018.program.rom (ST-0018 PROGRAM)"
+firmware15_desc = "st018.program.rom"
 firmware15_path = "st018.program.rom"
 firmware15_opt = "true"
-firmware16_desc = "sgb.boot.rom (SGB BOOT)"
+firmware16_desc = "sgb.boot.rom (SGB Boot Image)"
 firmware16_path = "sgb.boot.rom"
 firmware16_opt = "true"
-notes = "- core uses split ROMS for special chip games|- notable DSP1/DSP1B games: Super Mario Kart / Pilotwings|- notable DSP2 games: Dungeon Master|- notable DSP3 games: SD Gundam GX|- notable DSP4 games: Top Gear 3000|- Cx4 emulation broken"
+notes = "[1] bsnes/higan Performance uses split ROMS for special chip games.|[*] Notable DSP1/DSP1B Games: Super Mario Kart, Pilotwings|[*] Notable DSP2 Games: Dungeon Master|[*] Notable DSP3 Games: SD Gundam GX|[*] Notable DSP4 Games: Top Gear 3000|[2] Emulation for Cx4 games is broken."
diff --git a/dist/info/craft_libretro.info b/dist/info/craft_libretro.info
index 4d36af54..bb8c44e3 100644
--- a/dist/info/craft_libretro.info
+++ b/dist/info/craft_libretro.info
@@ -3,7 +3,7 @@ authors = "Snes9x Team|dking|BassAceGold|ShadauxCat|Nebuleon"
 supported_extensions = ""
 corename = "Craft"
 categories = "Game"
-systemname = "Minecraft game clone"
+systemname = "Minecraft Game Clone"
 license = "MIT"
 permissions = ""
 display_version = "v1"
diff --git a/dist/info/dinothawr_libretro.info b/dist/info/dinothawr_libretro.info
index eb25a97c..9f42be0d 100644
--- a/dist/info/dinothawr_libretro.info
+++ b/dist/info/dinothawr_libretro.info
@@ -9,3 +9,4 @@ license = "Non-commercial"
 permissions = ""
 display_version = "v1.0"
 supports_no_game = "false"
+notes = "(!) Dinothawr requires data ROM 'Dinothawr.zip'.|(!) Load Content 'dinothawr.game'."
diff --git a/dist/info/easyrpg_libretro.info b/dist/info/easyrpg_libretro.info
index ca5e6dfa..1bcdc67e 100644
--- a/dist/info/easyrpg_libretro.info
+++ b/dist/info/easyrpg_libretro.info
@@ -4,7 +4,7 @@ supported_extensions = "ini"
 corename = "EasyRPG"
 categories = "Game"
 database = "RPG Maker 2000|RPG Maker 2003"
-systemname = "RPG Maker 2000/2003 game engine"
+systemname = "RPG Maker 2000/2003 Game Engine"
 license = "GPLv3"
 permissions = ""
 display_version = "1.0.0.4"
diff --git a/dist/info/emux_sms_libretro.info b/dist/info/emux_sms_libretro.info
index a7e3c846..9c3fded4 100644
--- a/dist/info/emux_sms_libretro.info
+++ b/dist/info/emux_sms_libretro.info
@@ -11,6 +11,7 @@ permissions = ""
 display_version = "Git"
 supports_no_game = "false"
 firmware_count = 1
-firmware0_desc = "bios.sms (Sega Master System BIOS)"
+firmware0_desc = "bios.sms (Master System BIOS)"
 firmware0_path = "bios.sms"
 firmware0_opt = "false"
+notes = "(!) bios.sms (md5): missing"
diff --git a/dist/info/fbalpha2012_cps1_libretro.info b/dist/info/fbalpha2012_cps1_libretro.info
index c9f92a76..8adea409 100644
--- a/dist/info/fbalpha2012_cps1_libretro.info
+++ b/dist/info/fbalpha2012_cps1_libretro.info
@@ -9,4 +9,4 @@ license = "Non-commercial"
 permissions = ""
 display_version = "v0.2.97.30"
 supports_no_game = "false"
-notes = "- BIOS files go into the ROM directory|"
+notes = "(!) The BIOS files must be inside the ROM directory."
diff --git a/dist/info/fbalpha2012_cps2_libretro.info b/dist/info/fbalpha2012_cps2_libretro.info
index 865c8438..df4fce85 100644
--- a/dist/info/fbalpha2012_cps2_libretro.info
+++ b/dist/info/fbalpha2012_cps2_libretro.info
@@ -9,4 +9,4 @@ license = "Non-commercial"
 permissions = ""
 display_version = "v0.2.97.30"
 supports_no_game = "false"
-notes = "- BIOS files go into the ROM directory|"
+notes = "(!) The BIOS files must be inside the ROM directory."
diff --git a/dist/info/fbalpha2012_cps3_libretro.info b/dist/info/fbalpha2012_cps3_libretro.info
index 7534fb86..0b78e9a4 100644
--- a/dist/info/fbalpha2012_cps3_libretro.info
+++ b/dist/info/fbalpha2012_cps3_libretro.info
@@ -9,4 +9,4 @@ license = "Non-commercial"
 permissions = ""
 display_version = "v0.2.97.30"
 supports_no_game = "false"
-notes = "- BIOS files go into the ROM directory|"
+notes = "(!) The BIOS files must be inside the ROM directory."
diff --git a/dist/info/fbalpha2012_libretro.info b/dist/info/fbalpha2012_libretro.info
index 63012cd5..899d24ff 100644
--- a/dist/info/fbalpha2012_libretro.info
+++ b/dist/info/fbalpha2012_libretro.info
@@ -9,4 +9,4 @@ license = "Non-commercial"
 permissions = ""
 display_version = "v0.2.97.30"
 supports_no_game = "false"
-notes = "- BIOS files go into the ROM directory|"
+notes = "(!) The BIOS files must be inside the ROM directory."
diff --git a/dist/info/fbalpha2012_neogeo_libretro.info b/dist/info/fbalpha2012_neogeo_libretro.info
index 158d4529..7fa7da44 100644
--- a/dist/info/fbalpha2012_neogeo_libretro.info
+++ b/dist/info/fbalpha2012_neogeo_libretro.info
@@ -9,4 +9,4 @@ license = "Non-commercial"
 permissions = ""
 display_version = "v0.2.97.30"
 supports_no_game = "false"
-notes = "- BIOS files go into the ROM directory|"
+notes = "(!) The BIOS files must be inside the ROM directory."
diff --git a/dist/info/fbalpha_libretro.info b/dist/info/fbalpha_libretro.info
index 9782edc3..35c4f540 100644
--- a/dist/info/fbalpha_libretro.info
+++ b/dist/info/fbalpha_libretro.info
@@ -10,4 +10,4 @@ license = "Non-commercial"
 permissions = ""
 display_version = "v0.2.97.38"
 supports_no_game = "false"
-notes = "- BIOS files go into the ROM directory|"
+notes = "(!) The BIOS files must be inside the ROM directory.|"
diff --git a/dist/info/fceumm_libretro.info b/dist/info/fceumm_libretro.info
index 57d75945..f3c19666 100644
--- a/dist/info/fceumm_libretro.info
+++ b/dist/info/fceumm_libretro.info
@@ -14,4 +14,4 @@ firmware_count = 1
 firmware0_desc = "disksys.rom (Famicom Disk System BIOS)"
 firmware0_path = "disksys.rom"
 firmware0_opt = "false"
-notes = "Suggested md5sum:|ca30b50f880eb660a320674ed365ef7a = disksys.rom"
+notes = "(!) disksys.rom (md5): ca30b50f880eb660a320674ed365ef7a"
diff --git a/dist/info/fmsx_libretro.info b/dist/info/fmsx_libretro.info
index 1af1c6bd..09fbe7f5 100644
--- a/dist/info/fmsx_libretro.info
+++ b/dist/info/fmsx_libretro.info
@@ -26,4 +26,4 @@ firmware3_opt = "false"
 firmware4_desc = "MSX2PEXT.ROM (MSX2+ ExtROM)"
 firmware4_path = "MSX2PEXT.ROM"
 firmware4_opt = "false"
-notes = "Suggested md5sums:|364a1a579fe5cb8dba54519bcfcdac0d = MSX.ROM|ec3a01c91f24fbddcbcab0ad301bc9ef= MSX2.ROM|2183c2aff17cf4297bdb496de78c2e8a = MSX2EXT.ROM|847cc025ffae665487940ff2639540e5 = MSX2P.ROM|7c8243c71d8f143b2531f01afa6a05dc = MSX2PEXT.ROM"
+notes = "(!) MSX.ROM (md5): 364a1a579fe5cb8dba54519bcfcdac0d|(!) MSX2.ROM (md5): ec3a01c91f24fbddcbcab0ad301bc9ef|(!) MSX2EXT.ROM (md5): 2183c2aff17cf4297bdb496de78c2e8a|(!) MSX2P.ROM (md5): 847cc025ffae665487940ff2639540e5|(!) MSX2PEXT.ROM (md5): 7c8243c71d8f143b2531f01afa6a05dc"
diff --git a/dist/info/fuse_libretro.info b/dist/info/fuse_libretro.info
index e09ab720..47e8432d 100644
--- a/dist/info/fuse_libretro.info
+++ b/dist/info/fuse_libretro.info
@@ -10,4 +10,4 @@ license = "GPLv3"
 permissions = ""
 display_version = "1.1.1"
 supports_no_game = "false"
-notes = "Amstrad have kindly given their permission for the redistribution of their copyrighted material but retain that copyright"
+notes = "[1] Amstrad have kindly given their permission for the redistribution|[^] of their copyrighted material but retain that copyright."
diff --git a/dist/info/genesis_plus_gx_libretro.info b/dist/info/genesis_plus_gx_libretro.info
index 23711189..04fe3f38 100644
--- a/dist/info/genesis_plus_gx_libretro.info
+++ b/dist/info/genesis_plus_gx_libretro.info
@@ -32,16 +32,16 @@ firmware5_opt = "true"
 firmware6=desc = "bios.gg (GameGear BIOS)"
 firmware6_path = "bios.gg"
 firmware6_opt = "true"
-firmware7_desc = "sk.bin (Sonic & Knuckles (2 MiB) ROM)"
+firmware7_desc = "sk.bin (Sonic & Knuckles ROM)"
 firmware7_path = "sk.bin"
 firmware7_opt = "true"
-firmware8_desc = "sk2chip.bin (Sonic & Knuckles UPMEM (256 KiB) ROM)"
+firmware8_desc = "sk2chip.bin (Sonic & Knuckles UPMEM ROM)"
 firmware8_path = "sk2chip.bin"
 firmware8_opt = "true"
-firmware9_desc = "areplay.bin (Action Replay (Pro) ROM)"
+firmware9_desc = "areplay.bin (Action Replay ROM)"
 firmware9_path = "areplay.bin"
 firmware9_opt = "true"
 firmware10_desc = "ggenie.bin (Game Genie ROM)"
 firmware10_path = "ggenie.bin"
 firmware10_opt = "true"
-notes = "Suggested md5sums:|b4e76e416b887f4e7413ba76fa735f16 = sk2chip.bin|4ea493ea4e9f6c9ebfccbdb15110367e = sk.bin"
+notes = "(!) sk2chip.bin (md5): b4e76e416b887f4e7413ba76fa735f16|(!) sk.bin (md5): 4ea493ea4e9f6c9ebfccbdb15110367e"
diff --git a/dist/info/gpsp_libretro.info b/dist/info/gpsp_libretro.info
index 35788943..bf50c5bd 100644
--- a/dist/info/gpsp_libretro.info
+++ b/dist/info/gpsp_libretro.info
@@ -11,7 +11,7 @@ permissions = ""
 display_version = "Git"
 supports_no_game = "false"
 firmware_count = 1
-firmware0_desc = "gba_bios.bin (GBA BIOS)"
+firmware0_desc = "gba_bios.bin (Game Boy Advance BIOS)"
 firmware0_path = "gba_bios.bin"
 firmware0_opt = "false"
-notes = "Suggested md5sum:|a860e8c0b6d573d191e4ec7db1b1e4f6 = gba_bios.bin"
+notes = "(!) gba_bios.bin (md5): a860e8c0b6d573d191e4ec7db1b1e4f6"
diff --git a/dist/info/gw_libretro.info b/dist/info/gw_libretro.info
index fdaf7d18..20bceff1 100644
--- a/dist/info/gw_libretro.info
+++ b/dist/info/gw_libretro.info
@@ -1,11 +1,11 @@
-display_name = "Game & Watch (GW)"
+display_name = "Handheld Electronic (GW)"
 authors = "Andre Leiradella"
 supported_extensions = "mgw"
 corename = "GW"
-manufacturer = "Nintendo"
+manufacturer = "Various"
 categories = "Emulator"
-systemname = "Game & Watch"
-database = "Nintendo - Game and Watch"
+systemname = "Handheld Electronic"
+database = "Handheld Electronic Game"
 license = "zlib"
 permissions = ""
 display_version = "Git"
diff --git a/dist/info/handy_libretro.info b/dist/info/handy_libretro.info
index c15588b8..857735a2 100644
--- a/dist/info/handy_libretro.info
+++ b/dist/info/handy_libretro.info
@@ -14,4 +14,4 @@ firmware_count = 1
 firmware0_desc = "lynxboot.img (Lynx Boot Image)"
 firmware0_path = "lynxboot.img"
 firmware0_opt = "true"
-notes = "Suggested md5sum:|fcd403db69f54290b51035d82f835e7b = lynxboot.img"
+notes = "(!) lynxboot.img (md5): fcd403db69f54290b51035d82f835e7b"
diff --git a/dist/info/hatari_libretro.info b/dist/info/hatari_libretro.info
index afdd2715..56ecc03f 100644
--- a/dist/info/hatari_libretro.info
+++ b/dist/info/hatari_libretro.info
@@ -10,6 +10,7 @@ permissions = ""
 display_version = "1.7"
 supports_no_game = "false"
 firmware_count = 1
-firmware0_desc = "tos.img (TOS image file)"
+firmware0_desc = "tos.img (TOS Boot Image)"
 firmware0_path = "tos.img"
 firmware0_opt = "false"
+notes = "(!) tos.img (md5): c1c57ce48e8ee4135885cee9e63a68a2"
diff --git a/dist/info/lutro_libretro.info b/dist/info/lutro_libretro.info
index 7b25d46f..9e4df0a4 100644
--- a/dist/info/lutro_libretro.info
+++ b/dist/info/lutro_libretro.info
@@ -1,4 +1,4 @@
-display_name = "Lutro"
+display_name = "LUA Engine (Lutro)"
 authors = "Higor Euripedes/Jean-Andre Santoni"
 supported_extensions = "lutro|lua"
 corename = "Lutro"
diff --git a/dist/info/mame2000_libretro.info b/dist/info/mame2000_libretro.info
index 8e7f0e95..98a7ee2e 100644
--- a/dist/info/mame2000_libretro.info
+++ b/dist/info/mame2000_libretro.info
@@ -10,4 +10,4 @@ license = "MAME"
 permissions = ""
 display_version = "0.37b5"
 supports_no_game = "false"
-notes = "- BIOS files go into the ROM directory|"
+notes = "(!) The BIOS files must be inside the ROM directory.|"
diff --git a/dist/info/mame2003_libretro.info b/dist/info/mame2003_libretro.info
index 990814d6..320f6dd3 100644
--- a/dist/info/mame2003_libretro.info
+++ b/dist/info/mame2003_libretro.info
@@ -10,4 +10,4 @@ license = "MAME"
 permissions = ""
 display_version = "0.78"
 supports_no_game = "false"
-notes = "- BIOS files go into the ROM directory|"
+notes = "(!) The BIOS files must be inside the ROM directory.|"
diff --git a/dist/info/mame2003_midway_libretro.info b/dist/info/mame2003_midway_libretro.info
index 436ecf1d..a0f77c8d 100644
--- a/dist/info/mame2003_midway_libretro.info
+++ b/dist/info/mame2003_midway_libretro.info
@@ -10,4 +10,4 @@ license = "MAME"
 permissions = ""
 display_version = "0.78"
 supports_no_game = "false"
-notes = "- BIOS files go into the ROM directory|"
+notes = "(!) The BIOS files must be inside the ROM directory.|"
diff --git a/dist/info/mame2010_libretro.info b/dist/info/mame2010_libretro.info
index 043573b1..08180be3 100644
--- a/dist/info/mame2010_libretro.info
+++ b/dist/info/mame2010_libretro.info
@@ -10,4 +10,4 @@ license = "MAME"
 permissions = ""
 display_version = "0.139"
 supports_no_game = "false"
-notes = "- BIOS files go into the ROM directory|"
+notes = "(!) The BIOS files must be inside the ROM directory.|"
diff --git a/dist/info/mame2014_libretro.info b/dist/info/mame2014_libretro.info
index dbaf5569..8ea1dddf 100644
--- a/dist/info/mame2014_libretro.info
+++ b/dist/info/mame2014_libretro.info
@@ -10,4 +10,4 @@ license = "MAME"
 permissions = ""
 display_version = "0.159"
 supports_no_game = "false"
-notes = "- core supports MAME save states|- core supports extracted MAME cheats|- BIOS files go into the ROM directory|- CHD files go into the ROM directory in a directory with the same name|- ARTWORK, CHEATS, SAMPLES may go into SYSTEMDIR\mame into their own directories|- STATES, NVRAM, INPUT, SNAPS, CFG, MEMCARD, DIFF will be saved to SAVEDIR\mame into their own directories"
+notes = "[1] MAME 2014 (0.159) supports MAME save states.|[2] MAME 2014 (0.159) supports extracted MAME cheats.|[3] The BIOS files must be inside the ROM directory.|[4] The same directory with CHD files inside must be inside the ROM directory.|[5] If desired, the ARTWORK, CHEATS, and SAMPLES directories can be|[^] inside the 'SYSTEMDIR\mame' directory.|[6] When saving, the following directories will be created in the 'SAVEDIR\mame'|[^] directory: STATES, NVRAM, INPUT, SNAPS, CFG, MEMCARD, and DIFF."
diff --git a/dist/info/mame_libretro.info b/dist/info/mame_libretro.info
index 4e90fbd8..4e246352 100644
--- a/dist/info/mame_libretro.info
+++ b/dist/info/mame_libretro.info
@@ -10,4 +10,4 @@ license = "MAME"
 permissions = ""
 display_version = "Git"
 supports_no_game = "false"
-notes = "- core supports MAME save states|- core supports extracted MAME cheats|- BIOS files go into the ROM directory|- CHD files go into the ROM directory in a directory with the same name|- ARTWORK, CHEATS, SAMPLES may go into SYSTEMDIR\mame into their own directories|- STATES, NVRAM, INPUT, SNAPS, CFG, MEMCARD, DIFF will be saved to SAVEDIR\mame into their own directories"
+notes = "[1] MAME 2014 (0.159) supports MAME save states.|[2] MAME 2014 (0.159) supports extracted MAME cheats.|[3] The BIOS files must be inside the ROM directory.|[4] The same directory with CHD files inside must be inside the ROM directory.|[5] If desired, the ARTWORK, CHEATS, and SAMPLES directories can be|[^] inside the 'SYSTEMDIR\mame' directory.|[6] When saving, the following directories will be created in the 'SAVEDIR\mame'|[^] directory: STATES, NVRAM, INPUT, SNAPS, CFG, MEMCARD, and DIFF."
diff --git a/dist/info/mednafen_gba_libretro.info b/dist/info/mednafen_gba_libretro.info
index 738655ac..832c3a96 100644
--- a/dist/info/mednafen_gba_libretro.info
+++ b/dist/info/mednafen_gba_libretro.info
@@ -11,7 +11,7 @@ permissions = ""
 display_version = "v0.9.36"
 supports_no_game = "false"
 firmware_count = 1
-firmware0_desc = "gba_bios.bin (GBA BIOS)"
+firmware0_desc = "gba_bios.bin (Game Boy Advance BIOS)"
 firmware0_path = "gba_bios.bin"
 firmware0_opt = "true"
-notes = "Suggested md5sum:|a860e8c0b6d573d191e4ec7db1b1e4f6 = gba_bios.bin"
+notes = "(!) gba_bios.bin (md5): a860e8c0b6d573d191e4ec7db1b1e4f6"
diff --git a/dist/info/mednafen_lynx_libretro.info b/dist/info/mednafen_lynx_libretro.info
index 5e5cfa21..1fb87441 100644
--- a/dist/info/mednafen_lynx_libretro.info
+++ b/dist/info/mednafen_lynx_libretro.info
@@ -14,4 +14,4 @@ firmware_count = 1
 firmware0_desc = "lynxboot.img (Lynx Boot Image)"
 firmware0_path = "lynxboot.img"
 firmware0_opt = "false"
-notes = "Suggested md5sum:|fcd403db69f54290b51035d82f835e7b = lynxboot.img"
+notes = "(!) lynxboot.img (md5): fcd403db69f54290b51035d82f835e7b"
diff --git a/dist/info/mednafen_pce_fast_libretro.info b/dist/info/mednafen_pce_fast_libretro.info
index 80cd0dcd..fddc18ad 100644
--- a/dist/info/mednafen_pce_fast_libretro.info
+++ b/dist/info/mednafen_pce_fast_libretro.info
@@ -14,4 +14,4 @@ firmware_count = 1
 firmware0_desc = "syscard3.pce (PCE-CD BIOS)"
 firmware0_path = "syscard3.pce"
 firmware0_opt = "false"
-notes = "Suggested md5sum:|ff1a674273fe3540ccef576376407d1d = syscard3.pce"
+notes = "(!) syscard3.pce (md5): ff1a674273fe3540ccef576376407d1d"
diff --git a/dist/info/mednafen_pcfx_libretro.info b/dist/info/mednafen_pcfx_libretro.info
index 5d9bbf2d..277b221e 100644
--- a/dist/info/mednafen_pcfx_libretro.info
+++ b/dist/info/mednafen_pcfx_libretro.info
@@ -14,4 +14,4 @@ firmware_count = 1
 firmware0_desc = "pcfx.bios (PC-FX BIOS)"
 firmware0_path = "pcfx.bios"
 firmware0_opt = "false"
-notes = "Suggested md5sums:|1c8996258dfe6c1a07df305f0a3e5758 = pcfx.bios"
+notes = "(!) pcfx.bios (md5): 1c8996258dfe6c1a07df305f0a3e5758"
diff --git a/dist/info/mednafen_psx_hw_libretro.info b/dist/info/mednafen_psx_hw_libretro.info
index c13d1030..61abeb03 100644
--- a/dist/info/mednafen_psx_hw_libretro.info
+++ b/dist/info/mednafen_psx_hw_libretro.info
@@ -20,4 +20,4 @@ firmware1_opt = "false"
 firmware2_desc = "scph5502.bin (PS1 EU BIOS)"
 firmware2_path = "scph5502.bin"
 firmware2_opt = "false"
-notes = "Suggested md5sums:|8dd7d5296a650fac7319bce665a6a53c = scph5500.bin|490f666e1afb15b7362b406ed1cea246 = scph5501.bin|32736f17079d0b2b7024407c39bd3050 = scph5502.bin"
+notes = "(!) scph5500.bin (md5): 8dd7d5296a650fac7319bce665a6a53c|(!) scph5501.bin (md5): 490f666e1afb15b7362b406ed1cea246|(!) scph5502.bin (md5): 32736f17079d0b2b7024407c39bd3050"
diff --git a/dist/info/mednafen_psx_libretro.info b/dist/info/mednafen_psx_libretro.info
index d8cd7527..fa416270 100644
--- a/dist/info/mednafen_psx_libretro.info
+++ b/dist/info/mednafen_psx_libretro.info
@@ -20,4 +20,4 @@ firmware1_opt = "false"
 firmware2_desc = "scph5502.bin (PS1 EU BIOS)"
 firmware2_path = "scph5502.bin"
 firmware2_opt = "false"
-notes = "Suggested md5sums:|8dd7d5296a650fac7319bce665a6a53c = scph5500.bin|490f666e1afb15b7362b406ed1cea246 = scph5501.bin|32736f17079d0b2b7024407c39bd3050 = scph5502.bin"
+notes = "(!) scph5500.bin (md5): 8dd7d5296a650fac7319bce665a6a53c|(!) scph5501.bin (md5): 490f666e1afb15b7362b406ed1cea246|(!) scph5502.bin (md5): 32736f17079d0b2b7024407c39bd3050"
diff --git a/dist/info/mednafen_saturn_libretro.info b/dist/info/mednafen_saturn_libretro.info
index 552c50ab..1bd527ab 100644
--- a/dist/info/mednafen_saturn_libretro.info
+++ b/dist/info/mednafen_saturn_libretro.info
@@ -11,10 +11,10 @@ permissions = ""
 display_version = "v0.9.39.2"
 supports_no_game = "false"
 firmware_count = 2
-firmware0_desc = "sega_101.bin (Sega Saturn JP BIOS)"
+firmware0_desc = "sega_101.bin (Saturn JP BIOS)"
 firmware0_path = "sega_101.bin"
 firmware0_opt = "false"
-firmware1_desc = "mpr-17933.bin (Sega Saturn US/EU BIOS)"
+firmware1_desc = "mpr-17933.bin (Saturn US/EU BIOS)"
 firmware1_path = "mpr-17933.bin"
 firmware1_opt = "false"
-notes = "Suggested md5sums:|85ec9ca47d8f6807718151cbcca8b964  = sega_101.bin|3240872c70984b6cbfda1586cab68dbe = mpr-17933.bin"
+notes = "(!) sega_101.bin (md5): 85ec9ca47d8f6807718151cbcca8b964|(!) mpr-17933.bin (md5): 3240872c70984b6cbfda1586cab68dbe"
diff --git a/dist/info/mednafen_supergrafx_libretro.info b/dist/info/mednafen_supergrafx_libretro.info
index 944c3394..5cbc7301 100644
--- a/dist/info/mednafen_supergrafx_libretro.info
+++ b/dist/info/mednafen_supergrafx_libretro.info
@@ -14,4 +14,4 @@ firmware_count = 1
 firmware0_desc = "syscard3.pce (PCE-CD BIOS)"
 firmware0_path = "syscard3.pce"
 firmware0_opt = "false"
-notes = "Suggested md5sum:|ff1a674273fe3540ccef576376407d1d = syscard3.pce"
+notes = "(!) syscard3.pce (md5): ff1a674273fe3540ccef576376407d1d"
diff --git a/dist/info/mess2014_libretro.info b/dist/info/mess2014_libretro.info
index 7dfb2007..efc4b6c1 100644
--- a/dist/info/mess2014_libretro.info
+++ b/dist/info/mess2014_libretro.info
@@ -9,4 +9,4 @@ license = "MAME"
 permissions = ""
 display_version = "Git"
 supports_no_game = "false"
-notes = "- To load roms, you need the hashes in SYSTEMDIR\mess\hash and softlist romset|- You can get the hashes from the mame/mess source code|- core supports MESS save states|- core supports extracted MESS cheats|- BIOS files go into the ROM directory|- CHD files go into the ROM directory in a directory with the same name|- ARTWORK, CHEATS, SAMPLES may go into SYSTEMDIR\mess into their own directories|- STATES, NVRAM, INPUT, SNAPS, CFG, MEMCARD, DIFF will be saved to SAVEDIR\mess into their own directories"
+notes = "[1] MESS 2014 (Git) requires the hashes from the MAME/MESS source code|[^] to be inside the 'SYSTEMDIR\ume\hash' directory and softlist romset.|(!) [2] MESS 2014 (Git) supports MESS save states.|[3] MESS 2014 (Git) supports extracted MESS cheats.|[4] The BIOS files must be inside the ROM directory.|[5] The same directory with CHD files inside must be inside the ROM directory.|[6] If desired, the ARTWORK, CHEATS, and SAMPLES directories can be|[^] inside the 'SYSTEMDIR\mess' directory.|[7] When saving, the following directories will be created in the 'SAVEDIR\mess'|[^] directory: STATES, NVRAM, INPUT, SNAPS, CFG, MEMCARD, and DIFF."
diff --git a/dist/info/mgba_libretro.info b/dist/info/mgba_libretro.info
index cfb685de..0ee4bd2e 100644
--- a/dist/info/mgba_libretro.info
+++ b/dist/info/mgba_libretro.info
@@ -1,6 +1,6 @@
 display_name = "Game Boy Advance (mGBA)"
 authors = "Jeffrey Pfau"
-supported_extensions = "dmg|gb|gbc|gba"
+supported_extensions = "gb|gbc|gba"
 corename = "mGBA"
 manufacturer = "Nintendo"
 categories = "Emulator"
@@ -10,7 +10,7 @@ license = "MPLv2.0"
 permissions = ""
 supports_no_game = "false"
 firmware_count = 1
-firmware0_desc = "gba_bios.bin (GBA BIOS)"
+firmware0_desc = "gba_bios.bin (Game Boy Advance BIOS)"
 firmware0_path = "gba_bios.bin"
 firmware0_opt = "true"
-notes = "Suggested md5sum:|a860e8c0b6d573d191e4ec7db1b1e4f6 = gba_bios.bin"
+notes = "(!) gba_bios.bin (md5): a860e8c0b6d573d191e4ec7db1b1e4f6"
diff --git a/dist/info/mupen64plus_libretro.info b/dist/info/mupen64plus_libretro.info
index 4890df5d..e1ca9dcf 100644
--- a/dist/info/mupen64plus_libretro.info
+++ b/dist/info/mupen64plus_libretro.info
@@ -10,3 +10,8 @@ license = "GPLv2"
 permissions = "dynarec_optional"
 display_version = "2.0-rc2"
 supports_no_game = "false"
+firmware_count = 1
+firmware0_desc = "64DD_IPL.bin (64DD IPL ROM)"
+firmware0_path = "64DD_IPL.bin"
+firmware0_opt = "true"
+notes = "(!) 64DD_IPL.bin (md5): 8d3d9f294b6e174bc7b1d2fd1c727530"
diff --git a/dist/info/nestopia_libretro.info b/dist/info/nestopia_libretro.info
index 45fd0997..8c3f1232 100644
--- a/dist/info/nestopia_libretro.info
+++ b/dist/info/nestopia_libretro.info
@@ -1,6 +1,6 @@
 display_name = "NES / Famicom (Nestopia UE)"
 authors = "Martin Freij|R. Belmont|R. Danbrook"
-supported_extensions = "nes|fds"
+supported_extensions = "nes|fds|unf|unif"
 corename = "Nestopia"
 manufacturer = "Nintendo"
 categories = "Emulator"
@@ -14,4 +14,4 @@ firmware_count = 1
 firmware0_desc = "disksys.rom (Famicom Disk System BIOS)"
 firmware0_path = "disksys.rom"
 firmware0_opt = "false"
-notes = "Suggested md5sum:|ca30b50f880eb660a320674ed365ef7a = disksys.rom"
+notes = "(!) disksys.rom (md5): ca30b50f880eb660a320674ed365ef7a"
diff --git a/dist/info/nxengine_libretro.info b/dist/info/nxengine_libretro.info
index c54b785a..827fe16b 100644
--- a/dist/info/nxengine_libretro.info
+++ b/dist/info/nxengine_libretro.info
@@ -4,8 +4,9 @@ supported_extensions = "exe"
 corename = "NXEngine"
 categories = "Game"
 database = "Cave Story"
-systemname = "Cave Story game engine"
+systemname = "Cave Story Game Engine"
 license = "GPLv3"
 permissions = ""
 display_version = "1.0.0.4"
 supports_no_game = "false"
+notes = "(!) NXEngine requires data ROM 'Cave Story (en).zip'.|(!) Load Content 'Doukutsu.exe'"
diff --git a/dist/info/o2em_libretro.info b/dist/info/o2em_libretro.info
index ccfb9a24..2b883a83 100644
--- a/dist/info/o2em_libretro.info
+++ b/dist/info/o2em_libretro.info
@@ -14,4 +14,4 @@ firmware_count = 1
 firmware0_desc = "o2rom.bin (Odyssey2 BIOS)"
 firmware0_path = "o2rom.bin"
 firmware0_opt = "false"
-notes = "Suggested md5sum:|562d5ebf9e030a40d6fabfc2f33139fd = o2rom.bin"
+notes = "(!) o2rom.bin (md5): 562d5ebf9e030a40d6fabfc2f33139fd"
diff --git a/dist/info/pcsx1_libretro.info b/dist/info/pcsx1_libretro.info
index 1dc3b4ef..cb4abfa0 100644
--- a/dist/info/pcsx1_libretro.info
+++ b/dist/info/pcsx1_libretro.info
@@ -20,4 +20,4 @@ firmware1_opt = "true"
 firmware2_desc = "scph5502.bin (PS1 EU BIOS)"
 firmware2_path = "scph5502.bin"
 firmware2_opt = "true"
-notes = "Suggested md5sums:|8dd7d5296a650fac7319bce665a6a53c = scph5500.bin|490f666e1afb15b7362b406ed1cea246 = scph5501.bin|32736f17079d0b2b7024407c39bd3050 = scph5502.bin"
+notes = "(!) scph5500.bin (md5): 8dd7d5296a650fac7319bce665a6a53c|(!) scph5501.bin (md5): 490f666e1afb15b7362b406ed1cea246|(!) scph5502.bin (md5): 32736f17079d0b2b7024407c39bd3050"
diff --git a/dist/info/pcsx_rearmed_interpreter_libretro.info b/dist/info/pcsx_rearmed_interpreter_libretro.info
index 3f945c56..b6a3d9b4 100644
--- a/dist/info/pcsx_rearmed_interpreter_libretro.info
+++ b/dist/info/pcsx_rearmed_interpreter_libretro.info
@@ -20,4 +20,4 @@ firmware1_opt = "true"
 firmware2_desc = "scph5502.bin (PS1 EU BIOS)"
 firmware2_path = "scph5502.bin"
 firmware2_opt = "true"
-notes = "Suggested md5sums:|8dd7d5296a650fac7319bce665a6a53c = scph5500.bin|490f666e1afb15b7362b406ed1cea246 = scph5501.bin|32736f17079d0b2b7024407c39bd3050 = scph5502.bin"
+notes = "(!) scph5500.bin (md5): 8dd7d5296a650fac7319bce665a6a53c|(!) scph5501.bin (md5): 490f666e1afb15b7362b406ed1cea246|(!) scph5502.bin (md5): 32736f17079d0b2b7024407c39bd3050"
diff --git a/dist/info/pcsx_rearmed_libretro.info b/dist/info/pcsx_rearmed_libretro.info
index f9055566..ea4dfb88 100644
--- a/dist/info/pcsx_rearmed_libretro.info
+++ b/dist/info/pcsx_rearmed_libretro.info
@@ -20,4 +20,4 @@ firmware1_opt = "true"
 firmware2_desc = "scph5502.bin (PS1 EU BIOS)"
 firmware2_path = "scph5502.bin"
 firmware2_opt = "true"
-notes = "Suggested md5sums:|8dd7d5296a650fac7319bce665a6a53c = scph5500.bin|490f666e1afb15b7362b406ed1cea246 = scph5501.bin|32736f17079d0b2b7024407c39bd3050 = scph5502.bin"
+notes = "(!) scph5500.bin (md5): 8dd7d5296a650fac7319bce665a6a53c|(!) scph5501.bin (md5): 490f666e1afb15b7362b406ed1cea246|(!) scph5502.bin (md5): 32736f17079d0b2b7024407c39bd3050"
diff --git a/dist/info/pcsx_rearmed_libretro_neon.info b/dist/info/pcsx_rearmed_libretro_neon.info
index 137dcd97..13c17a18 100644
--- a/dist/info/pcsx_rearmed_libretro_neon.info
+++ b/dist/info/pcsx_rearmed_libretro_neon.info
@@ -20,4 +20,4 @@ firmware1_opt = "true"
 firmware2_desc = "scph5502.bin (PS1 EU BIOS)"
 firmware2_path = "scph5502.bin"
 firmware2_opt = "true"
-notes = "Suggested md5sums:|8dd7d5296a650fac7319bce665a6a53c = scph5500.bin|490f666e1afb15b7362b406ed1cea246 = scph5501.bin|32736f17079d0b2b7024407c39bd3050 = scph5502.bin"
+notes = "(!) scph5500.bin (md5): 8dd7d5296a650fac7319bce665a6a53c|(!) scph5501.bin (md5): 490f666e1afb15b7362b406ed1cea246|(!) scph5502.bin (md5): 32736f17079d0b2b7024407c39bd3050"
diff --git a/dist/info/picodrive_libretro.info b/dist/info/picodrive_libretro.info
index d900992a..769b9bd2 100644
--- a/dist/info/picodrive_libretro.info
+++ b/dist/info/picodrive_libretro.info
@@ -20,4 +20,4 @@ firmware1_opt = "false"
 firmware2_desc = "bios_CD_J.bin (MegaCD JP BIOS)"
 firmware2_path = "bios_CD_J.bin"
 firmware2_opt = "false"
-notes = "Suggested md5sums:| bios_CD_J.bin = e66fa1dc5820d254611fdcdba0662372| bios_CD_U.bin = 278a9397d192149e84e820ac621a8edd| bios_CD_E.bin = 2efd74e3232ff260e371b99f84024f7f"
+notes = "(!) bios_CD_U.bin (md5): 278a9397d192149e84e820ac621a8edd|(!) bios_CD_E.bin (md5): 2efd74e3232ff260e371b99f84024f7f|(!) bios_CD_J.bin (md5): e66fa1dc5820d254611fdcdba0662372"
diff --git a/dist/info/ppsspp_libretro.info b/dist/info/ppsspp_libretro.info
index 6f6b0f3b..dacbe410 100644
--- a/dist/info/ppsspp_libretro.info
+++ b/dist/info/ppsspp_libretro.info
@@ -10,4 +10,8 @@ license = "GPLv2"
 permissions = ""
 display_version = "Git"
 supports_no_game = "false"
-notes = "Suggested md5sums:|a93fc411c1ce7d001a2a812643c70085 = ppge_atlas.zim"
+firmware_count = 1
+firmware0_desc = "ppge_atlas.zim (PPSSPP Data ROM)"
+firmware0_path = "ppge_atlas.zim"
+firmware0_opt = "false"
+notes = "(!) ppge_atlas.zim (md5): a93fc411c1ce7d001a2a812643c70085|(!) PPSSPP requires the asset files, lang folder, and flash0 folder inside the 'system\PPSSPP' directory."
diff --git a/dist/info/prboom_libretro.info b/dist/info/prboom_libretro.info
index 1ed5c94d..938973cc 100644
--- a/dist/info/prboom_libretro.info
+++ b/dist/info/prboom_libretro.info
@@ -4,10 +4,10 @@ supported_extensions = "wad|iwad"
 corename = "PrBoom"
 manufacturer = "Id Software"
 categories = "Game"
-systemname = "DOOM game engine"
+systemname = "DOOM Game Engine"
 database = "DOOM"
 license = "GPLv2"
 permissions = ""
 display_version = "v2.5.0"
 supports_no_game = "false"
-notes = "- prboom.wad needs to be in the ROM directory|"
+notes = "(!) PrBoom requires data ROM 'prboom.wad' inside the ROM directory.|(!) Load Content 'doom1.wad'."
diff --git a/dist/info/prosystem_libretro.info b/dist/info/prosystem_libretro.info
index 6463d35e..ac8ce599 100644
--- a/dist/info/prosystem_libretro.info
+++ b/dist/info/prosystem_libretro.info
@@ -11,7 +11,7 @@ permissions = ""
 display_version = "1.3e"
 supports_no_game = "false"
 firmware_count = 1
-firmware0_desc = "7800 BIOS (U).rom (Atari 7800 BIOS)"
+firmware0_desc = "7800 BIOS (U).rom (7800 BIOS)"
 firmware0_path = "7800 BIOS (U).rom"
 firmware0_opt = "true"
-notes = "Suggested md5sum:|0763f1ffb006ddbe32e52d497ee848ae = 7800 BIOS (U).rom"
+notes = "(!) 7800 BIOS (U).rom (md5): 0763f1ffb006ddbe32e52d497ee848ae"
diff --git a/dist/info/psp1_libretro.info b/dist/info/psp1_libretro.info
index e3cb885b..6e9112a9 100644
--- a/dist/info/psp1_libretro.info
+++ b/dist/info/psp1_libretro.info
@@ -10,3 +10,8 @@ license = "GPLv2"
 permissions = ""
 display_version = "Git"
 supports_no_game = "false"
+firmware_count = 1
+firmware0_desc = "ppge_atlas.zim (PPSSPP Data ROM)"
+firmware0_path = "ppge_atlas.zim"
+firmware0_opt = "false"
+notes = "(!) ppge_atlas.zim (md5): a93fc411c1ce7d001a2a812643c70085|(!) PPSSPP requires the asset files, lang folder, and flash0 folder inside the 'system\PPSSPP' directory.
diff --git a/dist/info/reicast_libretro.info b/dist/info/reicast_libretro.info
index 58cf6ca4..7e957894 100644
--- a/dist/info/reicast_libretro.info
+++ b/dist/info/reicast_libretro.info
@@ -1,6 +1,6 @@
 display_name = "Sega Dreamcast (Reicast)"
 authors = "skmp"
-supported_extensions = "chd|cdi|iso|elf|bin|cue|gdi"
+supported_extensions = "cdi|gdi|chd|cue"
 corename = "Reicast"
 manufacturer = "Sega"
 categories = "Emulator"
@@ -11,10 +11,10 @@ permissions = ""
 display_version = "Git"
 supports_no_game = "false"
 firmware_count = 2
-firmware0_desc = "dc_boot.bin"
+firmware0_desc = "dc_boot.bin (Dreamcast BIOS)"
 firmware0_path = "dc/dc_boot.bin"
 firmware0_opt = "false"
-firmware1_desc = "dc_flash.bin"
+firmware1_desc = "dc_flash.bin (Date/Time/Language)"
 firmware1_path = "dc/dc_flash.bin"
 firmware1_opt = "false"
-notes = "Suggested md5sums:|e10c53c2f8b90bab96ead2d368858623 = dc_boot.bin|0a93f7940c455905bea6e392dfde92a4 = dc_flash.bin"
+notes = "(!) dc_boot.bin (md5): e10c53c2f8b90bab96ead2d368858623|(!) dc_flash.bin (md5): 0a93f7940c455905bea6e392dfde92a4"
diff --git a/dist/info/snes9x2005_plus_libretro.info b/dist/info/snes9x2005_plus_libretro.info
old mode 100755
new mode 100644
diff --git a/dist/info/tempgba_libretro.info b/dist/info/tempgba_libretro.info
index afe7c0a2..001f2625 100644
--- a/dist/info/tempgba_libretro.info
+++ b/dist/info/tempgba_libretro.info
@@ -14,4 +14,4 @@ firmware_count = 1
 firmware0_desc = "gba_bios.bin (Game Boy Advance BIOS)"
 firmware0_path = "gba_bios.bin"
 firmware0_opt = "false"
-notes = "Suggested md5sum:|a860e8c0b6d573d191e4ec7db1b1e4f6 = gba_bios.bin"
+notes = "(!) gba_bios.bin (md5): a860e8c0b6d573d191e4ec7db1b1e4f6"
diff --git a/dist/info/tyrquake_libretro.info b/dist/info/tyrquake_libretro.info
index f48b1f87..6a7250ab 100644
--- a/dist/info/tyrquake_libretro.info
+++ b/dist/info/tyrquake_libretro.info
@@ -4,7 +4,7 @@ supported_extensions = "pak"
 corename = "TyrQuake"
 manufacturer = "Id Software"
 categories = "Game"
-systemname = "Quake game engine"
+systemname = "Quake Game Engine"
 license = "GPLv2"
 permissions = ""
 display_version = "v0.62"
diff --git a/dist/info/ume2014_libretro.info b/dist/info/ume2014_libretro.info
index 5b141e02..c52452d5 100644
--- a/dist/info/ume2014_libretro.info
+++ b/dist/info/ume2014_libretro.info
@@ -9,4 +9,4 @@ license = "MAME"
 permissions = ""
 display_version = "Git"
 supports_no_game = "false"
-notes = "- To load roms, you need the hashes in SYSTEMDIR\ume\hash and softlist romset|- You can get the hashes from the mame/mess source code|- core supports ume save states|- core supports extracted ume cheats|- BIOS files go into the ROM directory|- CHD files go into the ROM directory in a directory with the same name|- ARTWORK, CHEATS, SAMPLES may go into SYSTEMDIR\ume into their own directories|- STATES, NVRAM, INPUT, SNAPS, CFG, MEMCARD, DIFF will be saved to SAVEDIR\ume into their own directories"
+notes = "[1] UME 2014 (Git) requires the hashes from the MAME/MESS source code|[^] to be inside the 'SYSTEMDIR\ume\hash' directory and softlist romset|(!) [2] UME 2014 (Git) supports UME save states.|[3] UME 2014 (Git) supports extracted UME cheats.|[4] The BIOS files must be inside the ROM directory.|[5] The same directory with CHD files inside must be inside the ROM directory.|[6] If desired, the ARTWORK, CHEATS, and SAMPLES directories can be|[^] inside the 'SYSTEMDIR\ume' directory.|[7] When saving, the following directories will be created in the 'SAVEDIR\ume'|[^] directory: STATES, NVRAM, INPUT, SNAPS, CFG, MEMCARD, and DIFF."
diff --git a/dist/info/vba_next_libretro.info b/dist/info/vba_next_libretro.info
index 10e0a9fc..8d52543b 100644
--- a/dist/info/vba_next_libretro.info
+++ b/dist/info/vba_next_libretro.info
@@ -14,4 +14,4 @@ firmware_count = 1
 firmware0_desc = "gba_bios.bin (Game Boy Advance BIOS)"
 firmware0_path = "gba_bios.bin"
 firmware0_opt = "false"
-notes = "Suggested md5sum:|a860e8c0b6d573d191e4ec7db1b1e4f6 = gba_bios.bin"
+notes = "(!) gba_bios.bin (md5): a860e8c0b6d573d191e4ec7db1b1e4f6"
diff --git a/dist/info/yabause_libretro.info b/dist/info/yabause_libretro.info
index 39d7253c..796ef811 100644
--- a/dist/info/yabause_libretro.info
+++ b/dist/info/yabause_libretro.info
@@ -14,4 +14,4 @@ firmware_count = 1
 firmware0_desc = "saturn_bios.bin (Saturn BIOS)"
 firmware0_path = "saturn_bios.bin"
 firmware0_opt = "true"
-notes = "Suggested md5sum:|af5828fdff51384f99b3c4926be27762 = saturn_bios.bin"
+notes = "(!) saturn_bios.bin (md5): af5828fdff51384f99b3c4926be27762"
diff --git a/libretro-build-database.sh b/libretro-build-database.sh
index e6942dee..d20aabcb 100755
--- a/libretro-build-database.sh
+++ b/libretro-build-database.sh
@@ -196,6 +196,7 @@ build_libretro_databases() {
 	build_libretro_database "Nintendo - Nintendo 64" "rom.crc"
 	build_libretro_database "Nintendo - Nintendo 64DD" "rom.crc"
 	build_libretro_database "Nintendo - Virtual Boy" "rom.crc"
+	build_libretro_database "Atari - 2600" "rom.crc"
 	build_libretro_database "Atari - 5200" "rom.crc"
 	build_libretro_database "Atari - 7800" "rom.crc"
 	build_libretro_database "Atari - Lynx" "rom.crc"
diff --git a/libretro-buildbot-recipe.sh b/libretro-buildbot-recipe.sh
index 860b8a91..a9e8e9d6 100755
--- a/libretro-buildbot-recipe.sh
+++ b/libretro-buildbot-recipe.sh
@@ -1316,8 +1316,6 @@ key.alias.password=buildbot
 
 EOF
 
-		$NDK clean | tee $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_RetroArch_${PLATFORM}.log
-		$NDK -j${JOBS} | tee -a $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_RetroArch_${PLATFORM}.log
 		if [ "${RELEASE}" == "NO" ]; then
 			python ./version_increment.py
 		else
diff --git a/recipes/android/cores-android-cross.conf b/recipes/android/cores-android-cross.conf
index 7d1945bc..1d1bb49e 100644
--- a/recipes/android/cores-android-cross.conf
+++ b/recipes/android/cores-android-cross.conf
@@ -6,5 +6,6 @@ PATH /home/buildbot/tools/android/android-ndk-r13b:/home/buildbot/tools/android/
 PLATFORM android
 platform android
 MAKE make
+NDK_TOOLCHAIN_VERSION 4.9
 LIBSUFFIX _android
 CORE_JOB YES
diff --git a/recipes/android/cores-android-jni.conf b/recipes/android/cores-android-jni.conf
index 889982f2..4e42b881 100644
--- a/recipes/android/cores-android-jni.conf
+++ b/recipes/android/cores-android-jni.conf
@@ -6,6 +6,7 @@ PLATFORM android
 platform android
 MAKE make
 NDK ndk-build
+NDK_TOOLCHAIN_VERSION 4.9
 RA NO
 LIBSUFFIX _android
 CORE_JOB YES
diff --git a/recipes/linux/cores-linux-armhf-generic.conf b/recipes/linux/cores-linux-armhf-generic.conf
index f798af28..127eea93 100644
--- a/recipes/linux/cores-linux-armhf-generic.conf
+++ b/recipes/linux/cores-linux-armhf-generic.conf
@@ -3,3 +3,4 @@ PLATFORM unix
 MAKEPORTABLE YES
 CORE_JOB YES
 MAKE make
+PATH /usr/lib/ccache
diff --git a/recipes/linux/cores-linux-x64-cross.conf b/recipes/linux/cores-linux-x64-cross.conf
index 0e7923c9..8a0894b7 100644
--- a/recipes/linux/cores-linux-x64-cross.conf
+++ b/recipes/linux/cores-linux-x64-cross.conf
@@ -3,3 +3,5 @@ PLATFORM linux
 MAKEPORTABLE YES
 CORE_JOB YES
 MAKE make
+PATH /usr/lib/ccache
+
diff --git a/recipes/linux/cores-linux-x64-generic.conf b/recipes/linux/cores-linux-x64-generic.conf
index f798af28..764bcaaf 100644
--- a/recipes/linux/cores-linux-x64-generic.conf
+++ b/recipes/linux/cores-linux-x64-generic.conf
@@ -3,3 +3,5 @@ PLATFORM unix
 MAKEPORTABLE YES
 CORE_JOB YES
 MAKE make
+PATH /usr/lib/ccache
+
diff --git a/recipes/linux/cores-linux-x86-generic.conf b/recipes/linux/cores-linux-x86-generic.conf
index f798af28..127eea93 100644
--- a/recipes/linux/cores-linux-x86-generic.conf
+++ b/recipes/linux/cores-linux-x86-generic.conf
@@ -3,3 +3,4 @@ PLATFORM unix
 MAKEPORTABLE YES
 CORE_JOB YES
 MAKE make
+PATH /usr/lib/ccache
diff --git a/recipes/linux/retroarch-linux-x64.conf b/recipes/linux/retroarch-linux-x64.conf
index 81a7f093..5c11ad64 100644
--- a/recipes/linux/retroarch-linux-x64.conf
+++ b/recipes/linux/retroarch-linux-x64.conf
@@ -1,6 +1,7 @@
 platform unix
 PLATFORM unix
 MAKEPORTABLE NO
+CONFIGURE ./configure
 CORE_JOB YES
 MAKE make
 PATH /usr/lib/ccache