diff --git a/DVD/AudioSubPictureAttributesTable.cs b/DVD/AudioSubPictureAttributesTable.cs
index b555775..06137d7 100644
--- a/DVD/AudioSubPictureAttributesTable.cs
+++ b/DVD/AudioSubPictureAttributesTable.cs
@@ -1,6 +1,6 @@
 namespace SabreTools.Models.DVD
 {
-    /// <see href="https://dvd.sourceforge.net/dvdinfo/ifo.html"/>
+    /// <see href="https://dvd.sourceforge.net/dvdinfo/ifo_vmg.html"/>
     public sealed class AudioSubPictureAttributesTable
     {
         /// <summary>
@@ -11,7 +11,7 @@ namespace SabreTools.Models.DVD
         /// <summary>
         /// Reserved
         /// </summary>
-        public byte[]? Reserved { get; set; }
+        public ushort Reserved { get; set; }
 
         /// <summary>
         /// End address (last byte of last VTS_ATRT)
@@ -21,11 +21,12 @@ namespace SabreTools.Models.DVD
         /// <summary>
         /// Offset to VTS_ATRT n
         /// </summary>
+        /// <remarks>NumberOfTitleSets entries</remarks>
         public uint[]? Offsets { get; set; }
 
         /// <summary>
         /// Entries
         /// </summary>
-        public AudioSubPictureAttributesTableEntry?[]? Entries { get; set; }
+        public AudioSubPictureAttributesTableEntry[]? Entries { get; set; }
     }
 }
\ No newline at end of file
diff --git a/DVD/AudioSubPictureAttributesTableEntry.cs b/DVD/AudioSubPictureAttributesTableEntry.cs
index b8c0137..8913a8a 100644
--- a/DVD/AudioSubPictureAttributesTableEntry.cs
+++ b/DVD/AudioSubPictureAttributesTableEntry.cs
@@ -1,6 +1,6 @@
 namespace SabreTools.Models.DVD
 {
-    /// <see href="https://dvd.sourceforge.net/dvdinfo/ifo.html"/>
+    /// <see href="https://dvd.sourceforge.net/dvdinfo/ifo_vmg.html"/>
     public sealed class AudioSubPictureAttributesTableEntry
     {
         /// <summary>
diff --git a/DVD/CellAddressTable.cs b/DVD/CellAddressTable.cs
index a808a2b..f3b88a6 100644
--- a/DVD/CellAddressTable.cs
+++ b/DVD/CellAddressTable.cs
@@ -11,7 +11,7 @@ namespace SabreTools.Models.DVD
         /// <summary>
         /// Reserved
         /// </summary>
-        public byte[]? Reserved { get; set; }
+        public ushort Reserved { get; set; }
 
         /// <summary>
         /// End address (last byte of last entry)
@@ -21,6 +21,7 @@ namespace SabreTools.Models.DVD
         /// <summary>
         /// 12-byte entries
         /// </summary>
-        public CellAddressTableEntry?[]? Entries { get; set; }
+        /// <remarks>NumberOfVOBIDs entries</remarks>
+        public CellAddressTableEntry[]? Entries { get; set; }
     }
 }
\ No newline at end of file
diff --git a/DVD/LanguageUnitTable.cs b/DVD/LanguageUnitTable.cs
index 2001961..e0df4e8 100644
--- a/DVD/LanguageUnitTable.cs
+++ b/DVD/LanguageUnitTable.cs
@@ -11,7 +11,7 @@ namespace SabreTools.Models.DVD
         /// <summary>
         /// Reserved
         /// </summary>
-        public byte[]? Reserved { get; set; }
+        public ushort Reserved { get; set; }
 
         /// <summary>
         /// End address (last byte of last PGC in last LU)
@@ -22,11 +22,13 @@ namespace SabreTools.Models.DVD
         /// <summary>
         /// Language Units
         /// </summary>
-        public LanguageUnitTableEntry?[]? Entries { get; set; }
+        /// <remarks>NumberOfVOBIDs entries</remarks>
+        public LanguageUnitTableEntry[]? Entries { get; set; }
 
         /// <summary>
         /// Program Chains
         /// </summary>
-        public ProgramChainTable?[]? ProgramChains { get; set; }
+        /// <remarks>NumberOfVOBIDs entries</remarks>
+        public ProgramChainTable[]? ProgramChains { get; set; }
     }
 }
\ No newline at end of file
diff --git a/DVD/LanguageUnitTableEntry.cs b/DVD/LanguageUnitTableEntry.cs
index c52aa25..0790999 100644
--- a/DVD/LanguageUnitTableEntry.cs
+++ b/DVD/LanguageUnitTableEntry.cs
@@ -7,7 +7,7 @@ namespace SabreTools.Models.DVD
     public sealed class LanguageUnitTableEntry
     {
         /// <summary>
-        /// 	ISO639 language code
+        /// ISO639 language code
         /// </summary>
         public ushort ISO639LanguageCode;
 
diff --git a/DVD/ParentalManagementMasksTable.cs b/DVD/ParentalManagementMasksTable.cs
index 10f4560..d9d8c1f 100644
--- a/DVD/ParentalManagementMasksTable.cs
+++ b/DVD/ParentalManagementMasksTable.cs
@@ -25,7 +25,7 @@ namespace SabreTools.Models.DVD
         /// <summary>
         /// Entries
         /// </summary>
-        public ParentalManagementMasksTableEntry?[]? Entries { get; set; }
+        public ParentalManagementMasksTableEntry[]? Entries { get; set; }
 
         /// <summary>
         /// The PTL_MAIT contains the 16-bit masks for the VMG and
diff --git a/DVD/ProgramChainTable.cs b/DVD/ProgramChainTable.cs
index 4a017e3..bb0e13e 100644
--- a/DVD/ProgramChainTable.cs
+++ b/DVD/ProgramChainTable.cs
@@ -22,6 +22,7 @@ namespace SabreTools.Models.DVD
         /// <summary>
         /// Program Chains
         /// </summary>
-        public ProgramChainTableEntry?[]? Entries { get; set; }
+        /// <remarks>NumberOfProgramChains entries</remarks>
+        public ProgramChainTableEntry[]? Entries { get; set; }
     }
 }
\ No newline at end of file
diff --git a/DVD/TitlesTable.cs b/DVD/TitlesTable.cs
index 213fbe7..2236dd8 100644
--- a/DVD/TitlesTable.cs
+++ b/DVD/TitlesTable.cs
@@ -21,6 +21,7 @@ namespace SabreTools.Models.DVD
         /// <summary>
         /// 12-byte entries
         /// </summary>
-        public TitlesTableEntry?[]? Entries { get; set; }
+        /// <remarks>NumberOfTitles entries</remarks>
+        public TitlesTableEntry[]? Entries { get; set; }
     }
 }
\ No newline at end of file
diff --git a/DVD/VideoManagerIFO.cs b/DVD/VideoManagerIFO.cs
index e5e1ae0..e6f689a 100644
--- a/DVD/VideoManagerIFO.cs
+++ b/DVD/VideoManagerIFO.cs
@@ -1,4 +1,3 @@
-using System.Drawing;
 using System.Runtime.InteropServices;
 
 namespace SabreTools.Models.DVD