diff --git a/DiscImageChef.Devices/ChangeLog b/DiscImageChef.Devices/ChangeLog
index 2256727eb..fbb27a385 100644
--- a/DiscImageChef.Devices/ChangeLog
+++ b/DiscImageChef.Devices/ChangeLog
@@ -1,3 +1,8 @@
+2015-11-24  Natalia Portillo  <claunia@claunia.com>
+
+	* Device/ScsiCommands.cs:
+	  Use a bigger buffer for CD-TEXT.
+
 2015-11-24  Natalia Portillo  <claunia@claunia.com>
 
 	* Device/ScsiCommands.cs:
diff --git a/DiscImageChef.Devices/Device/ScsiCommands.cs b/DiscImageChef.Devices/Device/ScsiCommands.cs
index 755c3c5e2..ee54dd18e 100644
--- a/DiscImageChef.Devices/Device/ScsiCommands.cs
+++ b/DiscImageChef.Devices/Device/ScsiCommands.cs
@@ -846,7 +846,7 @@ namespace DiscImageChef.Devices
         {
             senseBuffer = new byte[32];
             byte[] cdb = new byte[10];
-            byte[] tmpBuffer = new byte[804];
+            byte[] tmpBuffer = new byte[1024];
             bool sense;
 
             cdb[0] = (byte)ScsiCommands.ReadTocPmaAtip;
diff --git a/DiscImageChef/ChangeLog b/DiscImageChef/ChangeLog
index 0fdf60f5b..f909e6e71 100644
--- a/DiscImageChef/ChangeLog
+++ b/DiscImageChef/ChangeLog
@@ -1,3 +1,9 @@
+2015-11-24  Natalia Portillo  <claunia@claunia.com>
+
+	* Commands/MediaInfo.cs:
+	  Added a workaround for Nintendo GameCube and Wii discs.
+	Added SCSI READ MEDIA SERIAL NUMBER support.
+
 2015-11-24  Natalia Portillo  <claunia@claunia.com>
 
 	* Commands/MediaInfo.cs:
diff --git a/DiscImageChef/Commands/MediaInfo.cs b/DiscImageChef/Commands/MediaInfo.cs
index 6e068ba96..2ced4f444 100644
--- a/DiscImageChef/Commands/MediaInfo.cs
+++ b/DiscImageChef/Commands/MediaInfo.cs
@@ -109,6 +109,8 @@ namespace DiscImageChef.Commands
             bool sense;
             double duration;
             DiskType dskType = DiskType.Unknown;
+            ulong blocks = 0;
+            uint blockSize = 0;
 
             if (dev.SCSIType == DiscImageChef.Decoders.SCSI.PeripheralDeviceTypes.DirectAccess ||
                dev.SCSIType == DiscImageChef.Decoders.SCSI.PeripheralDeviceTypes.MultiMediaDevice ||
@@ -117,9 +119,6 @@ namespace DiscImageChef.Commands
                dev.SCSIType == DiscImageChef.Decoders.SCSI.PeripheralDeviceTypes.SimplifiedDevice ||
                dev.SCSIType == DiscImageChef.Decoders.SCSI.PeripheralDeviceTypes.WriteOnceDevice)
             {
-                ulong blocks = 0;
-                uint blockSize = 0;
-
                 sense = dev.ReadCapacity(out cmdBuf, out senseBuf, dev.Timeout, out duration);
                 if (!sense)
                 {
@@ -187,7 +186,7 @@ namespace DiscImageChef.Commands
                             dskType = DiskType.CDMO;
                             break;
                         case 0x0008:
-                            dskType = DiskType.CDROM;
+                            dskType = DiskType.CD;
                             break;
                         case 0x0009:
                             dskType = DiskType.CDR;
@@ -763,14 +762,57 @@ namespace DiscImageChef.Commands
                         else
                         {
                             doWriteFile(outputPrefix, "_cdtext.bin", "SCSI READ TOC/PMA/ATIP", cmdBuf);
-                            DicConsole.WriteLine("CD-TEXT on Lead-In:\n{0}", Decoders.CD.CDTextOnLeadIn.Prettify(cmdBuf));
+                            //if(Decoders.CD.CDTextOnLeadIn.Decode(cmdBuf).HasValue)
+                              //  DicConsole.WriteLine("CD-TEXT on Lead-In:\n{0}", Decoders.CD.CDTextOnLeadIn.Prettify(cmdBuf));
                         }
                     }
                 }
                 #endregion CDs
+
+                #region Nintendo
+                if(dskType == DiskType.Unknown && blocks > 0)
+                {
+                    sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.DVD, 0, 0, MmcDiscStructureFormat.PhysicalInformation, 0, dev.Timeout, out duration);
+                    if (sense)
+                        DicConsole.ErrorWriteLine("READ DISC STRUCTURE: PFI\n{0}", Decoders.SCSI.Sense.PrettifySense(senseBuf));
+                    else
+                        doWriteFile(outputPrefix, "_readdiscstructure_dvd_pfi.bin", "SCSI READ DISC STRUCTURE", cmdBuf);
+                    sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.DVD, 0, 0, MmcDiscStructureFormat.DiscManufacturingInformation, 0, dev.Timeout, out duration);
+                    if(sense)
+                        DicConsole.ErrorWriteLine("READ DISC STRUCTURE: DMI\n{0}", Decoders.SCSI.Sense.PrettifySense(senseBuf));
+                    else
+                        doWriteFile(outputPrefix, "_readdiscstructure_dvd_dmi.bin", "SCSI READ DISC STRUCTURE", cmdBuf);
+                    sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.DVD, 0, 0, MmcDiscStructureFormat.CopyrightInformation, 0, dev.Timeout, out duration);
+                    if(sense)
+                        DicConsole.ErrorWriteLine("READ DISC STRUCTURE: CMI\n{0}", Decoders.SCSI.Sense.PrettifySense(senseBuf));
+                    else
+                        doWriteFile(outputPrefix, "_readdiscstructure_dvd_cmi.bin", "SCSI READ DISC STRUCTURE", cmdBuf);
+                    sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.DVD, 0, 0, MmcDiscStructureFormat.BurstCuttingArea, 0, dev.Timeout, out duration);
+                    if(sense)
+                        DicConsole.ErrorWriteLine("READ DISC STRUCTURE: BCA\n{0}", Decoders.SCSI.Sense.PrettifySense(senseBuf));
+                    else
+                        doWriteFile(outputPrefix, "_readdiscstructure_dvd_bca.bin", "SCSI READ DISC STRUCTURE", cmdBuf);
+                    
+                }
+                #endregion Nintendo
             }
 
             DicConsole.WriteLine("Media identified as {0}", dskType);
+
+            sense = dev.ReadMediaSerialNumber(out cmdBuf, out senseBuf, dev.Timeout, out duration);
+            if (sense)
+                DicConsole.ErrorWriteLine("READ MEDIA SERIAL NUMBER\n{0}", Decoders.SCSI.Sense.PrettifySense(senseBuf));
+            else
+            {
+                doWriteFile(outputPrefix, "_mediaserialnumber.bin", "SCSI READ MEDIA SERIAL NUMBER", cmdBuf);
+                if (cmdBuf.Length >= 4)
+                {
+                    DicConsole.Write("Media Serial Number: ");
+                    for (int i = 4; i < cmdBuf.Length; i++)
+                        DicConsole.Write("{0:X2}", cmdBuf[i]);
+                    DicConsole.WriteLine();
+                }
+            }
         }
 
         static void doWriteFile(string outputPrefix, string outputSuffix, string whatWriting, byte[] data)