Updated all changes for 4.6

Made all previous changes to the 4.6 version of the game, as well as
tweaked some minor changes necessary for this version.