Index: arch/ia32/src/drivers/ega.c
===================================================================
--- arch/ia32/src/drivers/ega.c	(revision f260256376448c046ff04aba6b7053dd023221c2)
+++ arch/ia32/src/drivers/ega.c	(revision 3c5006a0448fcfb143ebe28a3f43de4bd4bf5e83)
@@ -27,8 +27,10 @@
  */
 
- /** @addtogroup ia32	
+/** @addtogroup ia32	
  * @{
  */
-/** @file
+/**
+ * @file
+ * @brief EGA driver.
  */
 
@@ -145,5 +147,4 @@
 }
 
- /** @}
+/** @}
  */
-
Index: arch/ia32/src/drivers/i8254.c
===================================================================
--- arch/ia32/src/drivers/i8254.c	(revision f260256376448c046ff04aba6b7053dd023221c2)
+++ arch/ia32/src/drivers/i8254.c	(revision 3c5006a0448fcfb143ebe28a3f43de4bd4bf5e83)
@@ -27,8 +27,12 @@
  */
 
- /** @addtogroup ia32	
+/** @addtogroup ia32	
  * @{
  */
-/** @file
+/**
+ * @file
+ * @brief	i8254 chip driver.
+ *
+ * Low level time functions.
  */
 
@@ -48,12 +52,6 @@
 #include <interrupt.h>
 
-/*
- * i8254 chip driver.
- * Low level time functions.
- */
-
 #define CLK_PORT1	0x40
 #define CLK_PORT4	0x43
-
 
 #define CLK_CONST	1193180
@@ -138,5 +136,4 @@
 }
 
- /** @}
+/** @}
  */
-
Index: arch/ia32/src/drivers/i8259.c
===================================================================
--- arch/ia32/src/drivers/i8259.c	(revision f260256376448c046ff04aba6b7053dd023221c2)
+++ arch/ia32/src/drivers/i8259.c	(revision 3c5006a0448fcfb143ebe28a3f43de4bd4bf5e83)
@@ -27,8 +27,12 @@
  */
 
- /** @addtogroup ia32	
+/** @addtogroup ia32	
  * @{
  */
-/** @file
+/**
+ * @file
+ * @brief PIC driver.
+ *
+ * Programmable Interrupt Controller for UP systems based on i8259 chip.
  */
 
@@ -40,9 +44,4 @@
 #include <print.h>
 #include <interrupt.h>
-
-/*
- * This is the PIC driver.
- * Programmable Interrupt Controller for UP systems.
- */
 
 static void pic_spurious(int n, istate_t *istate);
@@ -132,5 +131,4 @@
 }
 
- /** @}
+/** @}
  */
-
Index: arch/ia32/src/drivers/vesa.c
===================================================================
--- arch/ia32/src/drivers/vesa.c	(revision f260256376448c046ff04aba6b7053dd023221c2)
+++ arch/ia32/src/drivers/vesa.c	(revision 3c5006a0448fcfb143ebe28a3f43de4bd4bf5e83)
@@ -27,8 +27,10 @@
  */
 
- /** @addtogroup ia32	
+/** @addtogroup ia32	
  * @{
  */
-/** @file
+/**
+ * @file
+ * @brief VESA frame buffer driver.
  */
 
@@ -71,5 +73,4 @@
 #endif
 
- /** @}
+/** @}
  */
-
Index: arch/mips32/src/exception.c
===================================================================
--- arch/mips32/src/exception.c	(revision f260256376448c046ff04aba6b7053dd023221c2)
+++ arch/mips32/src/exception.c	(revision 3c5006a0448fcfb143ebe28a3f43de4bd4bf5e83)
@@ -27,5 +27,5 @@
  */
 
- /** @addtogroup mips32	
+/** @addtogroup mips32	
  * @{
  */
@@ -173,5 +173,5 @@
 }
 
- /** @}
+/** @}
  */
 
Index: contrib/conf/gxemul.sh
===================================================================
--- contrib/conf/gxemul.sh	(revision f260256376448c046ff04aba6b7053dd023221c2)
+++ contrib/conf/gxemul.sh	(revision 3c5006a0448fcfb143ebe28a3f43de4bd4bf5e83)
@@ -1,4 +1,3 @@
 #!/bin/sh
-# Uspace addresses outside of normal memory (kernel has std. 8 or 16MB)
-# we place the pages at 24M
-	gxemul $@ -E testmips -X image.boot 
+
+gxemul $@ -E testmips -X image.boot 
Index: genarch/src/i8042/i8042.c
===================================================================
--- genarch/src/i8042/i8042.c	(revision f260256376448c046ff04aba6b7053dd023221c2)
+++ genarch/src/i8042/i8042.c	(revision 3c5006a0448fcfb143ebe28a3f43de4bd4bf5e83)
@@ -27,8 +27,12 @@
  */
 
- /** @addtogroup genarch	
+/** @addtogroup genarch	
  * @{
  */
-/** @file
+/**
+ * @file	i8042.c
+ * @brief	i8042 processor driver.
+ *
+ * It takes care of low-level keyboard functions.
  */
 
@@ -46,10 +50,5 @@
 #include <interrupt.h>
 
-/**
- * i8042 processor driver.
- * It takes care of low-level keyboard functions.
- */
-
-/** Keyboard commands. */
+/* Keyboard commands. */
 #define KBD_ENABLE	0xf4
 #define KBD_DISABLE	0xf5
@@ -576,5 +575,5 @@
 }
 
- /** @}
- */
-
+/** @}
+ */
+
