diff --git a/core/net/uipopt.h b/core/net/uipopt.h
index 06a0c8eb2..7e3354637 100644
--- a/core/net/uipopt.h
+++ b/core/net/uipopt.h
@@ -1,3 +1,8 @@
+/**
+ * \addtogroup uip
+ * @{
+ */
+
 /**
  * \defgroup uipopt Configuration options for uIP
  * @{
@@ -53,7 +58,7 @@
  *
  * This file is part of the uIP TCP/IP stack.
  *
- * $Id: uipopt.h,v 1.2 2006/08/09 16:13:40 bg- Exp $
+ * $Id: uipopt.h,v 1.3 2007/04/02 18:08:36 adamdunkels Exp $
  *
  */
 
@@ -542,3 +547,4 @@ typedef struct httpd_state uip_tcp_appstate_t
 
 #endif /* __UIPOPT_H__ */
 /** @} */
+/** @} */
diff --git a/core/sys/process.h b/core/sys/process.h
index b49e5510d..186c9f759 100644
--- a/core/sys/process.h
+++ b/core/sys/process.h
@@ -28,7 +28,7 @@
  *
  * This file is part of the Contiki operating system.
  *
- * @(#)$Id: process.h,v 1.6 2007/03/30 00:04:12 adamdunkels Exp $
+ * @(#)$Id: process.h,v 1.7 2007/04/02 18:07:26 adamdunkels Exp $
  */
 
 /**
@@ -39,7 +39,7 @@
 /**
  * \defgroup process Contiki processes
  *
- * A process in Contiki consists of a single \ref pt protothread.
+ * A process in Contiki consists of a single \ref pt "protothread".
  *
  * @{
  */
diff --git a/doc/contiki-mainpage.txt b/doc/contiki-mainpage.txt
index 176fb6272..7b3fb3c26 100644
--- a/doc/contiki-mainpage.txt
+++ b/doc/contiki-mainpage.txt
@@ -13,20 +13,21 @@ Contiki is designed for embedded systems with small amounts of
 memory. A typical Contiki configuration is 2 kilobytes of RAM and 40
 kilobytes of ROM. Contiki consists of an event-driven kernel on top of
 which application programs are dynamically loaded and unloaded at
-runtime. Contiki processes use light-weight protothreads that provide
-a linear, thread-like programming style on top of the event-driven
-kernel. Contiki also supports per-process optional preemptive
-multi-threading, interprocess communication using message passing
-through events, as well as an optional GUI subsystem with either
-direct graphic support for locally connected terminals or networked
-virtual display with VNC or over Telnet.
+runtime. Contiki processes use light-weight \ref pt "protothreads"
+that provide a linear, thread-like programming style on top of the
+event-driven kernel. Contiki also supports per-process optional
+preemptive multi-threading, interprocess communication using message
+passing through events, as well as an optional GUI subsystem with
+either direct graphic support for locally connected terminals or
+networked virtual display with VNC or over Telnet.
 
-Contiki contains two communication stacks: uIP and Rime. uIP is a
-small RFC-compliant TCP/IP stack that makes it possible for Contiki to
-communicate over the Internet. Rime is a lightweight communication
-stack designed for low-power radios. Rime provides a wide range of
-communication primitives, from best-effort local area broadcast, to
-reliable multi-hop bulk data flooding.
+Contiki contains two communication stacks: \ref uip "uIP" and \ref
+rime "Rime". uIP is a small RFC-compliant TCP/IP stack that makes it
+possible for Contiki to communicate over the Internet. Rime is a
+lightweight communication stack designed for low-power radios. Rime
+provides a wide range of communication primitives, from \ref rimeabc
+"best-effort local area broadcast", to \ref rudolph1
+"reliable multi-hop bulk data flooding".
 
 Contiki runs on a variety of platform ranging from embedded
 microcontrollers such as the MSP430 and the AVR to old