Index: /trunk/doc/VBox-doc.c
===================================================================
--- /trunk/doc/VBox-doc.c	(revision 60599)
+++ /trunk/doc/VBox-doc.c	(revision 60600)
@@ -155,4 +155,5 @@
  *  - Validation Kit:
  *      - @ref pg_validationkit_guideline
+ *      - @ref pg_bs3kit
  *
  * @todo Make links to the components.
Index: /trunk/src/VBox/ValidationKit/bootsectors/bs3kit/bs3kit-docs.c
===================================================================
--- /trunk/src/VBox/ValidationKit/bootsectors/bs3kit/bs3kit-docs.c	(revision 60599)
+++ /trunk/src/VBox/ValidationKit/bootsectors/bs3kit/bs3kit-docs.c	(revision 60600)
@@ -27,5 +27,5 @@
 
 
-/** @page pg_bs3kit BS3Kit - Boot Sector 3 Kit
+/** @page pg_bs3kit BS3Kit - Boot Sector Kit \#3
  *
  * The BS3Kit is a framework for bare metal floppy/usb image tests.
@@ -47,4 +47,6 @@
  *
  *
+ * @sa grp_bs3kit, grp_bs3kit_tmpl, grp_bs3kit_cmn, grp_bs3kit_mode,
+ *     grp_bs3kit_system
  *
  * @section sec_calling_convention      Calling convention
Index: /trunk/src/VBox/ValidationKit/bootsectors/bs3kit/bs3kit-template-header.h
===================================================================
--- /trunk/src/VBox/ValidationKit/bootsectors/bs3kit/bs3kit-template-header.h	(revision 60599)
+++ /trunk/src/VBox/ValidationKit/bootsectors/bs3kit/bs3kit-template-header.h	(revision 60600)
@@ -27,5 +27,5 @@
 #include "bs3kit.h"
 
-/** @defgroup grp_bs3kit_tmpl       BS3Kit Multi-Mode Code Templates
+/** @defgroup grp_bs3kit_tmpl       Multi-Mode Code Templates
  * @ingroup grp_bs3kit
  *
Index: /trunk/src/VBox/ValidationKit/bootsectors/bs3kit/bs3kit.h
===================================================================
--- /trunk/src/VBox/ValidationKit/bootsectors/bs3kit/bs3kit.h	(revision 60599)
+++ /trunk/src/VBox/ValidationKit/bootsectors/bs3kit/bs3kit.h	(revision 60600)
@@ -50,5 +50,5 @@
 
 /** @def BS3_USE_ALT_16BIT_TEXT_SEG
- * @addtogroup grp_bs3kit
+ * @ingroup grp_bs3kit
  * Combines the BS3_USE_RM_TEXT_SEG,  BS3_USE_X0_TEXT_SEG, and
  * BS3_USE_X1_TEXT_SEG indicators into a single one.
@@ -61,5 +61,5 @@
 
 /** @def BS3_MODEL_FAR_CODE
- * @addtogroup grp_bs3kit
+ * @ingroup grp_bs3kit
  * Default compiler model indicates far code.
  */
@@ -102,5 +102,9 @@
 RT_C_DECLS_BEGIN
 
-/** @defgroup grp_bs3kit     BS3Kit
+/** @defgroup grp_bs3kit     BS3Kit - Boot Sector Kit \#3
+ *
+ * The BS3Kit is a framework for bare metal floppy/usb image tests,
+ * see the @ref pg_bs3kit "doc page" for more.
+ *
  * @{ */
 
@@ -715,5 +719,5 @@
 
 
-/** @defgroup grp_bs3kit_system System structures
+/** @defgroup grp_bs3kit_system System Structures
  * @{ */
 /** The GDT, indexed by BS3_SEL_XXX shifted by 3. */
@@ -1055,5 +1059,5 @@
 
 
-/** @defgroup bs3kit_cross_ptr  Cross context pointer type
+/** @defgroup bs3kit_cross_ptr  Cross Context Pointer Type
  *
  * The cross context pointer type is
@@ -1064,5 +1068,4 @@
  * Cross context pointer base type.
  */
-#pragma pack(4)
 typedef union BS3XPTR
 {
@@ -1083,5 +1086,5 @@
 #endif
 } BS3XPTR;
-#pragma pack()
+AssertCompileSize(BS3XPTR, 4);
 
 
@@ -2500,6 +2503,7 @@
 typedef BS3TESTMODEENTRY const *PCBS3TESTMODEENTRY;
 
-/** Produces a BS3TESTMODEENTRY initializer for common (c16,c32,c64) test
- *  functions. */
+/** @def BS3TESTMODEENTRY_CMN
+ * Produces a BS3TESTMODEENTRY initializer for common (c16,c32,c64) test
+ * functions. */
 #define BS3TESTMODEENTRY_CMN(a_szTest, a_BaseNm) \
     {   /*pszSubTest =*/ a_szTest, \
@@ -2528,5 +2532,6 @@
     }
 
-/** A set of standard protypes to go with #BS3TESTMODEENTRY_CMN. */
+/** @def BS3TESTMODE_PROTOTYPES_CMN
+ * A set of standard protypes to go with #BS3TESTMODEENTRY_CMN. */
 #define BS3TESTMODE_PROTOTYPES_CMN(a_BaseNm) \
     FNBS3TESTDOMODE BS3_FAR_CODE    RT_CONCAT(a_BaseNm, _c16); \
@@ -2534,6 +2539,7 @@
     FNBS3TESTDOMODE BS3_FAR_CODE    RT_CONCAT(a_BaseNm, _c64)
 
-/** Produces a BS3TESTMODEENTRY initializer for a full set of mode test
- *  functions. */
+/** @def BS3TESTMODEENTRY_MODE
+ * Produces a BS3TESTMODEENTRY initializer for a full set of mode test
+ * functions. */
 #define BS3TESTMODEENTRY_MODE(a_szTest, a_BaseNm) \
     {   /*pszSubTest =*/ a_szTest, \
@@ -2562,5 +2568,6 @@
     }
 
-/** A set of standard protypes to go with #BS3TESTMODEENTRY_MODE. */
+/** @def BS3TESTMODE_PROTOTYPES_MODE
+ * A set of standard protypes to go with #BS3TESTMODEENTRY_MODE. */
 #define BS3TESTMODE_PROTOTYPES_MODE(a_BaseNm) \
     FNBS3TESTDOMODE BS3_FAR_CODE RT_CONCAT(a_BaseNm, _rm); \