diff --git a/Config/Glide64.rdb b/Config/Glide64.rdb
index 2fa89027f..ebecb2e2f 100644
--- a/Config/Glide64.rdb
+++ b/Config/Glide64.rdb
@@ -11,7 +11,7 @@
 // 2 - F3DEX 2.XX (The Legend of Zelda: Ocarina of Time)
 // 3 - F3DEX ? (WaveRace)
 // 4 - RSP SW 2.0D EXT (Star Wars: Shadows of the Empire)
-// 5 - RSP SW 2.0 (Diddy Kong Racing); 
+// 5 - RSP SW 2.0 (Diddy Kong Racing);
 // 6 - S2DEX 1.XX  (Yoshi's Story - SimCity 2000)
 // 7 - RSP SW PD (Perfect Dark)
 // 8 - F3DEXBG 2.08 (Conker's Bad Fur Day)
@@ -24,10 +24,10 @@
 057e7c62=1
 07200895=0
 0bf36d36=9
-0d7bbffb=-1 
+0d7bbffb=-1
 0d7cbffb=5
 0ff79527=2
-0ff795bf=-1 
+0ff795bf=-1
 1118b3e0=1
 1517a281=1
 168e9cd5=2
diff --git a/Config/Project64.cht b/Config/Project64.cht
index 9c51935fe..3be9de89d 100644
--- a/Config/Project64.cht
+++ b/Config/Project64.cht
@@ -3332,7 +3332,7 @@ Cheat3="Infinite\Continues",E95B4FA8 594F
 Cheat2="Infinite\Nitros\Player 1",E85F3A53 594F
 Cheat4="Infinite\Time",E95E552C 9BE8
 Cheat5="Play As",E85E5528 59??
-Cheat5_O=$5A ,$59 ,$5C ,$5B ,$56 ,$55 ,$58 ,$57 ,$62 ,$61 ,$64 ,$63 ,$5E ,$5D ,$60 ,$5F ,$6A ,$69 ,$6C ,$6B ,$66 ,$65 ,$68 ,$67 ,$72 ,$71 ,$74 
+Cheat5_O=$5A ,$59 ,$5C ,$5B ,$56 ,$55 ,$58 ,$57 ,$62 ,$61 ,$64 ,$63 ,$5E ,$5D ,$60 ,$5F ,$6A ,$69 ,$6C ,$6B ,$66 ,$65 ,$68 ,$67 ,$72 ,$71 ,$74
 
 //----
 
@@ -13916,7 +13916,7 @@ Name=Wayne Gretzky's 3D Hockey '98 (E)
 Cheat0="Max Score\Team 1",E9685578 504F
 Cheat1="Max Score\Team 2",E9688A88 504F
 Cheat2="Difficulty Mod",E8689A4F 59??
-Cheat2_O=$5A ,$59 ,$5C ,$5B ,$56 
+Cheat2_O=$5A ,$59 ,$5C ,$5B ,$56
 Cheat3="Anger metre always full",E861EE90 594F,E861EF7A 594F
 
 //----
diff --git a/Config/Project64.rdx b/Config/Project64.rdx
index 223d2f764..f22c544d0 100644
--- a/Config/Project64.rdx
+++ b/Config/Project64.rdx
@@ -1,8 +1,8 @@
 // PJ64 1.7 Official RDX (Rom Database eXtension) By Gent Beta Version 1.7.0.02
 // ----------------------------------------------------
-// 
+//
 // This file is only to be used with Project64 version 1.7
-// 
+//
 // ----------------------------------------------------
 
 [Meta]
@@ -22,7 +22,7 @@ Players=4
 ForceFeedback=Yes
 
 [033F4C13-319EE7A7-C:45]
-Good Name=007 - The World is Not Enough (U) 
+Good Name=007 - The World is Not Enough (U)
 Developer=Eurocom
 ReleaseDate=2000/10/17
 Genre=Shooter FP
@@ -458,7 +458,7 @@ ForceFeedback=Yes
 
 [B088FBB4-441E4B1D-C:50]
 Good Name=Bass Hunter 64 (E) [!]
-Developer=Gear Head Entertainment 
+Developer=Gear Head Entertainment
 ReleaseDate=1999/07/28
 Genre=Sport-Fishing
 Players=1
@@ -780,7 +780,7 @@ ForceFeedback=Yes
 Good Name=Buck Bumble (J) [!]
 Developer=Argonaut Games
 ReleaseDate=1998/11/20
-Genre=Action 
+Genre=Action
 Players=2
 ForceFeedback=Yes
 
@@ -1172,7 +1172,7 @@ ForceFeedback=No
 
 [079501B9-AB0232AB-C:4A]
 Good Name=Custom Robo V2 (J) [!]
-Developer=Noise (Marigul) / Marigul Management, Inc. 
+Developer=Noise (Marigul) / Marigul Management, Inc.
 ReleaseDate=2000/11/10
 Genre=Action
 Players=4
@@ -1541,7 +1541,7 @@ Players=4
 ForceFeedback=Yes
 
 [1E12883D-D3B92718-C:46]
-Good Name=Duke Nukem 64 (F) 
+Good Name=Duke Nukem 64 (F)
 Developer=Eurocom
 ReleaseDate=1997/11/14
 Genre=Shooter FP
@@ -2011,7 +2011,7 @@ Players=2
 ForceFeedback=Yes
 
 [8F89ABA0-C34C2610-C:70]
-Good Name=GameShark V3.3 (Unl) 
+Good Name=GameShark V3.3 (Unl)
 Developer=??
 ReleaseDate=??/??/??
 Genre=??
@@ -2261,7 +2261,7 @@ Players=4
 ForceFeedback=No
 
 [5C1B5FBD-7E961634-C:46]
-Good Name=Hexen (F) 
+Good Name=Hexen (F)
 Developer=Software Creations
 ReleaseDate=1997/06/24
 Genre=Action
@@ -2429,7 +2429,7 @@ Players=4
 ForceFeedback=Yes
 
 [29A045CE-ABA9060E-C:46]
-Good Name=Hydro Thunder (F) 
+Good Name=Hydro Thunder (F)
 Developer=Eurocom / Midway
 ReleaseDate=2000/02/28
 Genre=Racing-Boat
@@ -2488,7 +2488,7 @@ ForceFeedback=Yes
 
 [8C138BE0-95700E46-C:45]
 Good Name=In-Fisherman Bass Hunter 64 (U) [!]
-Developer=Gear Head Entertainment 
+Developer=Gear Head Entertainment
 ReleaseDate=1999/07/28
 Genre=Sport-Fishing
 Players=1
@@ -3014,7 +3014,7 @@ Players=1
 ForceFeedback=Yes
 
 [F3DD35BA-4152E075-C:45] //New entry in RDB 1.6x BETA13
-Good Name=Legend of Zelda, The - Ocarina of Time (U) (GC Version) 
+Good Name=Legend of Zelda, The - Ocarina of Time (U) (GC Version)
 Developer=Nintendo
 ReleaseDate=????/??/??
 Genre=Action-Adventure
@@ -3062,7 +3062,7 @@ Players=1
 ForceFeedback=Yes
 
 [917D18F6-69BC5453-C:45]
-Good Name=Legend of Zelda, The - Ocarina of Time - Master Quest (U) (Debug Rom) 
+Good Name=Legend of Zelda, The - Ocarina of Time - Master Quest (U) (Debug Rom)
 Developer=Nintendo
 ReleaseDate=Never
 Genre=Action-Adventure
@@ -3689,7 +3689,7 @@ ForceFeedback=Yes
 
 [E8E8DD70-415DD198-C:4A]
 Good Name=Morita Shogi 64 (J) [!]
-Developer=Seta 
+Developer=Seta
 ReleaseDate=1998/04/03
 Genre=Board Game
 Players=2
@@ -4285,7 +4285,7 @@ ForceFeedback=No
 
 [E86415A6-98395B53-C:50]
 Good Name=O.D.T (Or Die Trying) (E) (M5) (Unreleased Final)
-Developer=Infogrames 
+Developer=Infogrames
 ReleaseDate=Never
 Genre=Action
 Players=1
@@ -4293,7 +4293,7 @@ ForceFeedback=Yes
 
 [2655BB70-667D9925-C:45]
 Good Name=O.D.T (Or Die Trying) (U) (M3) (Unreleased Final)
-Developer=Infogrames 
+Developer=Infogrames
 ReleaseDate=Never
 Genre=Action
 Players=1
@@ -4734,7 +4734,7 @@ Players=4
 ForceFeedback=No
 
 [EFCEAF00-22094848-C:49]
-Good Name=Pokemon Stadium 2 (I) 
+Good Name=Pokemon Stadium 2 (I)
 Developer=Nintendo / HAL Laboratory
 ReleaseDate=2001/03/26
 Genre=Battle
@@ -4822,7 +4822,7 @@ Players=1
 ForceFeedback=No
 
 [1BDCB30F-A132D876-C:4A]
-Good Name=Pro Mahjong Tsuwamono 64 (J) 
+Good Name=Pro Mahjong Tsuwamono 64 (J)
 Developer=Culture Brain
 ReleaseDate=1999/11/05
 Genre=Board Game
@@ -5373,7 +5373,7 @@ Players=1
 ForceFeedback=No
 
 [02B46F55-61778D0B-C:59]
-Good Name=Shadowgate 64 - Trials of the Four Towers (IS) 
+Good Name=Shadowgate 64 - Trials of the Four Towers (IS)
 Developer=Infinite Ventures
 ReleaseDate=1999/06/09
 Genre=Adventure
@@ -6024,7 +6024,7 @@ Players=2
 ForceFeedback=Yes
 
 [486BF335-034DCC81-C:46]
-Good Name=Tom Clancy's Rainbow Six (F) 
+Good Name=Tom Clancy's Rainbow Six (F)
 Developer=Saffire
 ReleaseDate=1999/11/17
 Genre=Action
@@ -6344,7 +6344,7 @@ Players=4
 ForceFeedback=Yes
 
 [2E0E7749-B8B49D59-C:58]
-Good Name=Turok 2 - Seeds of Evil (FIS) 
+Good Name=Turok 2 - Seeds of Evil (FIS)
 Developer=Acclaim Studios Austin
 ReleaseDate=1999/11/23
 Genre=Action
@@ -6392,7 +6392,7 @@ Players=4
 ForceFeedback=Yes
 
 [2E0E7749-B8B49D59-C:58]
-Good Name=Turok 2 - Seeds of Evil (FIS) 
+Good Name=Turok 2 - Seeds of Evil (FIS)
 Developer=Iguana Entertainment
 ReleaseDate=1998/12/10
 Genre=Action
@@ -7114,7 +7114,7 @@ Players=1
 ForceFeedback=Yes
 
 [F7F52DB8-2195E636-C:4A]
-Good Name=Zelda no Densetsu - Toki no Ocarina - Zelda Collection Version (J) (GC Version) 
+Good Name=Zelda no Densetsu - Toki no Ocarina - Zelda Collection Version (J) (GC Version)
 Developer=Nintendo
 ReleaseDate=????/??/??
 Genre=Action-Adventure
@@ -7130,7 +7130,7 @@ Players=1
 ForceFeedback=Yes
 
 [F611F4BA-C584135C-C:4A]
-Good Name=Zelda no Densetsu - Toki no Ocarina GC (J) (GC Version) 
+Good Name=Zelda no Densetsu - Toki no Ocarina GC (J) (GC Version)
 Developer=Nintendo
 ReleaseDate=????/??/??
 Genre=Action-Adventure
diff --git a/Config/RDB Info.txt b/Config/RDB Info.txt
index 244167940..a4015d037 100644
--- a/Config/RDB Info.txt	
+++ b/Config/RDB Info.txt	
@@ -14,11 +14,11 @@ An emulated RDRAM size of 4MB is the standard amount of memory an N64 console ha
 An emulated RDRAM size of 8MB represents an N64 console with the 4MB memory expansion accessory installed, plus the original 4MB. This results in larger state saves and can lower performance. Most games do not benefit at all from the Expansion Pak. Some games require the Expansion Pak (e.g. Zelda2), some games give you more with it (e.g. Perfect Dark), some games just use it to raise resolution (in which case we recommend you don't use the Expansion Pak since graphics are HLE anyway, see below).
 
 Notes:
-- if a game supports the Expansion Pak as an option it will usually tell you in its introduction screens (usually two lines, like "Expansion Pak supported, Expansion Pak detected"). If a game doesn't support the Pak, or absolutely requires it, it probably won't say anything. 
-- you gain nothing by using the Expansion Pak on a game that doesn't support it - you just waste resources. 
-- further, if a game has optional Expansion Pak support where the Pak is used only to raise screen resolution, it is generally recommended you set this to No, because there's no point wasting resources on higher native resolutions when the graphics are high level emulated (hence largely resolution independant) anyway, also it can often cause severe aspect ratio problems in the video plugin. 
-- in rare cases, for reasons unkown to me, the Project64 video plugin requires the Expansion Pak to avoid an Access Violation (even in games that don't use the Expansion Pak). The RDB is already set up for this for all known cases. 
-- the above two points explain why the setting may sometimes appear to be logically incorrect - it has been set that way for a good reason! 
+- if a game supports the Expansion Pak as an option it will usually tell you in its introduction screens (usually two lines, like "Expansion Pak supported, Expansion Pak detected"). If a game doesn't support the Pak, or absolutely requires it, it probably won't say anything.
+- you gain nothing by using the Expansion Pak on a game that doesn't support it - you just waste resources.
+- further, if a game has optional Expansion Pak support where the Pak is used only to raise screen resolution, it is generally recommended you set this to No, because there's no point wasting resources on higher native resolutions when the graphics are high level emulated (hence largely resolution independant) anyway, also it can often cause severe aspect ratio problems in the video plugin.
+- in rare cases, for reasons unkown to me, the Project64 video plugin requires the Expansion Pak to avoid an Access Violation (even in games that don't use the Expansion Pak). The RDB is already set up for this for all known cases.
+- the above two points explain why the setting may sometimes appear to be logically incorrect - it has been set that way for a good reason!
 - this setting should already be correctly configured for every game by the RDB, don't change it unless you know what you're doing!
 
 Save Type