52 files changed, 191 insertions, 126 deletions

diff --git a/src/include/block_dns.h b/src/include/block_dns.h
index 2186cb1a1..2c573fb20 100644
--- a/src/include/block_dns.h
+++ b/src/include/block_dns.h
@@ -19,6 +19,9 @@
  */
 
 /**
+ * @addtogroup vpn_suite
+ * @{
+ *
  * @author Christian Grothoff
  *
  * @file
@@ -65,3 +68,5 @@ GNUNET_NETWORK_STRUCT_END
 #endif
 
 /** @} */  /* end of group */
+
+/** @} */  /* end of group addition to vpn_suite */
diff --git a/src/include/block_fs.h b/src/include/block_fs.h
index e4caf6e50..f05bb4a29 100644
--- a/src/include/block_fs.h
+++ b/src/include/block_fs.h
@@ -19,6 +19,9 @@
  */
 
 /**
+ * @addtogroup fs_l2
+ * @{
+ *
  * @author Christian Grothoff
  *
  * @file
@@ -98,3 +101,5 @@ GNUNET_NETWORK_STRUCT_END
 #endif
 
 /** @} */  /* end of group */
+
+/** @} */  /* end of group addition to fs_l2 */
diff --git a/src/include/gnunet_abd_service.h b/src/include/gnunet_abd_service.h
index 21f668a8d..a52ed29ff 100644
--- a/src/include/gnunet_abd_service.h
+++ b/src/include/gnunet_abd_service.h
@@ -19,13 +19,16 @@
  */
 
 /**
+ * @addtogroup reclaim_suite
+ * @{
+ *
  * @author Martin Schanzenbach
  *
  * @file
  * API to the Credential service
  *
  * @defgroup abd  Credential service
- * Credentials
+ * Credential service for Attribute-Based Decryption
  *
  * @{
  */
@@ -384,7 +387,7 @@ GNUNET_ABD_remove_delegation (struct GNUNET_ABD_Handle *handle,
  *
  * @param issuer the ego that should be used to issue the attribute
  * @param subject the subject of the attribute
- * @param attribute the name of the attribute
+ * @param iss_attr the name of the attribute
  * @param expiration the TTL of the credential
  * @return handle to the queued request
  */
@@ -415,3 +418,5 @@ GNUNET_ABD_request_cancel (struct GNUNET_ABD_Request *lr);
 #endif
 
 /** @} */  /* end of group */
+
+/** @} */  /* end of group addition to reclaim_suite */
diff --git a/src/include/gnunet_applications.h b/src/include/gnunet_applications.h
index 1e2ac59f7..489dc7050 100644
--- a/src/include/gnunet_applications.h
+++ b/src/include/gnunet_applications.h
@@ -19,6 +19,9 @@
  */
 
 /**
+ * @addtogroup Backbone
+ * @{
+ *
  * @author Christian Grothoff
  *
  * @file
@@ -133,4 +136,6 @@ extern "C"
 
 /** @} */  /* end of group */
 
+/** @} */  /* end of group addition to Backbone */
+
 /* end of gnunet_applications.h */
diff --git a/src/include/gnunet_ats_service.h b/src/include/gnunet_ats_service.h
index 11a65c4f5..321e621d2 100644
--- a/src/include/gnunet_ats_service.h
+++ b/src/include/gnunet_ats_service.h
@@ -158,7 +158,7 @@ struct GNUNET_ATS_PropertiesNBO
 /**
  * Convert ATS properties from host to network byte order.
  *
- * @param nbo[OUT] value written
+ * @param nbo[out] value written
  * @param hbo value read
  */
 void
@@ -169,7 +169,7 @@ GNUNET_ATS_properties_hton (struct GNUNET_ATS_PropertiesNBO *nbo,
 /**
  * Convert ATS properties from network to host byte order.
  *
- * @param hbo[OUT] value written
+ * @param hbo[out] value written
  * @param nbo value read
  */
 void
@@ -344,7 +344,7 @@ GNUNET_ATS_address_add_session (struct GNUNET_ATS_AddressRecord *ar,
  * @param session session handle
  * @return #GNUNET_YES if the @a ar was destroyed because
  *                     it was an incoming address,
- *         #GNUNET_NO if the @ar was kept because we can
+ *         #GNUNET_NO if the @a ar was kept because we can
  *                    use it still to establish a new session
  */
 int
diff --git a/src/include/gnunet_block_group_lib.h b/src/include/gnunet_block_group_lib.h
index d242ceefb..53827f5f4 100644
--- a/src/include/gnunet_block_group_lib.h
+++ b/src/include/gnunet_block_group_lib.h
@@ -90,7 +90,7 @@ GNUNET_BLOCK_GROUP_bf_create (void *cls,
  * @param bg block group to use for testing
  * @param hc hash of element to evaluate
  * @return #GNUNET_YES if @a hc is (likely) a duplicate
- *         #GNUNET_NO if @a hc was definitively not in @bg (but now is)
+ *         #GNUNET_NO if @a hc was definitively not in @a bg (but now is)
  */
 enum GNUNET_GenericReturnValue
 GNUNET_BLOCK_GROUP_bf_test_and_set (struct GNUNET_BLOCK_Group *bg,
diff --git a/src/include/gnunet_block_lib.h b/src/include/gnunet_block_lib.h
index fe6c99613..6a6de712b 100644
--- a/src/include/gnunet_block_lib.h
+++ b/src/include/gnunet_block_lib.h
@@ -131,7 +131,6 @@ struct GNUNET_BLOCK_Group;
  *
  * @param ctx block context in which the block group is created
  * @param type type of the block for which we are creating the group
- * @param nonce random value used to seed the group creation
  * @param raw_data optional serialized prior state of the group, NULL if unavailable/fresh
  * @param raw_data_size number of bytes in @a raw_data, 0 if unavailable/fresh
  * @param ... type-specific additional data, can be empty
@@ -272,7 +271,7 @@ GNUNET_BLOCK_group_set_seen (struct GNUNET_BLOCK_Group *bg,
 
 /**
  * Try merging two block groups.  Afterwards, @a bg1 should remain
- * valid and contain the rules from both @a bg1 and @bg2, and
+ * valid and contain the rules from both @a bg1 and @a bg2, and
  * @a bg2 should be destroyed (as part of this call).  The latter
  * should happen even if merging is not supported.
  *
diff --git a/src/include/gnunet_client_lib.h b/src/include/gnunet_client_lib.h
index 3cafa7e45..321810eb4 100644
--- a/src/include/gnunet_client_lib.h
+++ b/src/include/gnunet_client_lib.h
@@ -101,8 +101,8 @@ GNUNET_CLIENT_connect (const struct GNUNET_CONFIGURATION_Handle *cfg,
 
 /** @} */ /* end of group client */
 
-/* @} */ /* end of group addition */
+/** @} */ /* end of group addition */
 
-/* @} */ /* end of group addition */
+/** @} */ /* end of group addition */
 
 /* end of gnunet_client_lib.h */
diff --git a/src/include/gnunet_common.h b/src/include/gnunet_common.h
index 5035d6baa..8c58fd6e3 100644
--- a/src/include/gnunet_common.h
+++ b/src/include/gnunet_common.h
@@ -1510,7 +1510,7 @@ GNUNET_is_zero_ (const void *a,
  *        will be updated to reflect the new address. The TYPE of
  *        arr is important since size is the number of elements and
  *        not the size in bytes
- * @param len the number of elements in the existing vector (number
+ * @param len2 the number of elements in the existing vector (number
  *        of elements to copy over), will be updated with the new
  *        array size
 
@@ -1743,7 +1743,7 @@ GNUNET_copy_message (const struct GNUNET_MessageHeader *msg);
  * Set the async scope for the current thread.
  *
  * @param aid the async scope identifier
- * @param old_scope[out] location to save the old scope
+ * @param[out] old_scope location to save the old scope
  */
 void
 GNUNET_async_scope_enter (const struct GNUNET_AsyncScopeId *aid,
diff --git a/src/include/gnunet_configuration_lib.h b/src/include/gnunet_configuration_lib.h
index ac0013e94..2d26f3c05 100644
--- a/src/include/gnunet_configuration_lib.h
+++ b/src/include/gnunet_configuration_lib.h
@@ -174,7 +174,7 @@ GNUNET_CONFIGURATION_serialize_diagnostics (
  * @param mem the memory block of serialized configuration
  * @param size the size of the memory block
  * @param source_filename source filename, will be used
- *        to resolve relative @INLINE@ statements
+ *        to resolve relative \@INLINE\@ statements
  * @return #GNUNET_OK on success, #GNUNET_SYSERR on error
  */
 enum GNUNET_GenericReturnValue
diff --git a/src/include/gnunet_container_lib.h b/src/include/gnunet_container_lib.h
index 097ee040d..b31a95fac 100644
--- a/src/include/gnunet_container_lib.h
+++ b/src/include/gnunet_container_lib.h
@@ -28,24 +28,30 @@
  *
  * @file
  * Container classes for GNUnet
- *
- * @defgroup hashmap  Container library: MultiHashMap
+ * 
+ * @addtogroup container
+ * Common data structures in GNUnet programs 
+ * @{
+ * 
+ * @defgroup hashmap  MultiHashMap
  * Hash map with multiple values per key.
  *
  * @see [Documentation](https://gnunet.org/util_multihashmap)
  *
- * @defgroup heap  Container library: Heap
+ * @defgroup heap  Heap
  * Min- or max-heap with arbitrary element removal
  *
- * @defgroup bloomfilter  Container library: Bloom filter
+ * @defgroup bloomfilter  Bloom filter
  * Probabilistic set tests
  *
- * @defgroup dll  Container library: Doubly-linked list
+ * @defgroup dll  Doubly-linked list
  *
  * @see [Documentation](https://gnunet.org/mdll-api)
  *
- * @defgroup metadata  Container library: Metadata
+ * @defgroup metadata  Metadata
  * GNU libextractor key-value pairs
+ * 
+ * @}
  */
 
 #ifndef GNUNET_CONTAINER_LIB_H
diff --git a/src/include/gnunet_crypto_lib.h b/src/include/gnunet_crypto_lib.h
index 7ff50dda1..36e6743b3 100644
--- a/src/include/gnunet_crypto_lib.h
+++ b/src/include/gnunet_crypto_lib.h
@@ -1431,7 +1431,7 @@ enum GNUNET_GenericReturnValue
 GNUNET_CRYPTO_eddsa_private_key_from_string (
   const char *enc,
   size_t enclen,
-  struct GNUNET_CRYPTO_EddsaPrivateKey *pub);
+  struct GNUNET_CRYPTO_EddsaPrivateKey *priv);
 
 
 /**
@@ -1683,7 +1683,7 @@ GNUNET_CRYPTO_ecc_dlog_prepare (unsigned int max,
  * Calculate ECC discrete logarithm for small factors.
  * Opposite of #GNUNET_CRYPTO_ecc_dexp().
  *
- * @param dlc precalculated values, determine range of factors
+ * @param edc precalculated values, determine range of factors
  * @param input point on the curve to factor
  * @return INT_MAX if dlog failed, otherwise the factor
  */
@@ -1954,7 +1954,7 @@ GNUNET_CRYPTO_ecdsa_sign_ (
  *
  * @param priv
  * @param data
- * @param len
+ * @param size
  * @param sig
  * @return enum GNUNET_GenericReturnValue
  */
@@ -2239,7 +2239,7 @@ GNUNET_CRYPTO_ecdsa_public_key_derive (
  * @param label label to use for key deriviation
  * @param context additional context to use for HKDF of 'h';
  *        typically the name of the subsystem/application
- * @param purp the signature purpose
+ * @param purpose the signature purpose
  * @param sig the resulting signature
  * @return GNUNET_OK on success
  */
@@ -2304,7 +2304,7 @@ GNUNET_CRYPTO_eddsa_public_key_derive (
  * @param label label to use for key deriviation
  * @param context additional context to use for HKDF of 'h';
  *        typically the name of the subsystem/application
- * @param purp the signature purpose
+ * @param purpose the signature purpose
  * @param sig the resulting signature
  * @return GNUNET_OK on success
  */
@@ -2432,7 +2432,7 @@ GNUNET_CRYPTO_paillier_encrypt (
  * @param private_key Private key to use for decryption.
  * @param public_key Public key to use for decryption.
  * @param ciphertext Ciphertext to decrypt.
- * @param[out] m Decryption of @a ciphertext with @private_key.
+ * @param[out] m Decryption of @a ciphertext with @a private_key.
  */
 void
 GNUNET_CRYPTO_paillier_decrypt (
@@ -2690,7 +2690,7 @@ GNUNET_CRYPTO_rsa_public_key_cmp (const struct GNUNET_CRYPTO_RsaPublicKey *p1,
  * Blinds the given message with the given blinding key
  *
  * @param hash hash of the message to sign
- * @param bkey the blinding key
+ * @param bks the blinding key
  * @param pkey the public key of the signer
  * @param[out] buf set to a buffer with the blinded message to be signed
  * @param[out] buf_size number of bytes stored in @a buf
diff --git a/src/include/gnunet_curl_lib.h b/src/include/gnunet_curl_lib.h
index b5d62ba0f..92334887d 100644
--- a/src/include/gnunet_curl_lib.h
+++ b/src/include/gnunet_curl_lib.h
@@ -18,6 +18,9 @@
      SPDX-License-Identifier: AGPL3.0-or-later
  */
 /**
+ * @addtogroup lib_extra Additional libraries
+ * @{
+ *
  * @file src/include/gnunet_curl_lib.h
  * @brief library to make it easy to download JSON replies over HTTP
  * @author Sree Harsha Totakura <sreeharsha@totakura.in>
@@ -224,7 +227,7 @@ typedef void
  *           be executed AND cleaned up
  * @param jcc callback to invoke upon completion
  * @param jcc_cls closure for @a jcc
- * @return NULL on error (in this case, @eh is still released!)
+ * @return NULL on error (in this case, @a eh is still released!)
  */
 struct GNUNET_CURL_Job *
 GNUNET_CURL_job_add (struct GNUNET_CURL_Context *ctx,
@@ -246,7 +249,7 @@ GNUNET_CURL_job_add (struct GNUNET_CURL_Context *ctx,
  *           be executed AND cleaned up
  * @param jcc callback to invoke upon completion
  * @param jcc_cls closure for @a jcc
- * @return NULL on error (in this case, @eh is still released!)
+ * @return NULL on error (in this case, @a eh is still released!)
  */
 struct GNUNET_CURL_Job *
 GNUNET_CURL_job_add_with_ct_json (struct GNUNET_CURL_Context *ctx,
@@ -304,7 +307,7 @@ GNUNET_CURL_set_tlscert (struct GNUNET_CURL_Context *ctx,
  * @param job_headers extra headers to add for this request
  * @param jcc callback to invoke upon completion
  * @param jcc_cls closure for @a jcc
- * @return NULL on error (in this case, @eh is still released!)
+ * @return NULL on error (in this case, @a eh is still released!)
  */
 struct GNUNET_CURL_Job *
 GNUNET_CURL_job_add2 (struct GNUNET_CURL_Context *ctx,
@@ -324,10 +327,9 @@ GNUNET_CURL_job_add2 (struct GNUNET_CURL_Context *ctx,
  * @param eh curl easy handle for the request, will
  *           be executed AND cleaned up
  * @param job_headers extra headers to add for this request
- * @param max_reply_size largest acceptable response body
  * @param jcc callback to invoke upon completion
  * @param jcc_cls closure for @a jcc
- * @return NULL on error (in this case, @eh is still released!)
+ * @return NULL on error (in this case, @a eh is still released!)
  */
 struct GNUNET_CURL_Job *
 GNUNET_CURL_job_add_raw (struct GNUNET_CURL_Context *ctx,
@@ -437,4 +439,6 @@ GNUNET_CURL_is_valid_scope_id (const char *scope_id);
 #endif
 /** @} */  /* end of group */
 
+/** @} */  /* end of group addition to lib_extra */
+
 /* end of gnunet_curl_lib.h */
diff --git a/src/include/gnunet_dhtu_plugin.h b/src/include/gnunet_dhtu_plugin.h
index fa0b5f667..81b0f1d7b 100644
--- a/src/include/gnunet_dhtu_plugin.h
+++ b/src/include/gnunet_dhtu_plugin.h
@@ -119,7 +119,7 @@ struct GNUNET_DHTU_PluginEnvironment
    * @param cls the closure
    * @param target handle to the target,
    *    pointer will remain valid until @e disconnect_cb is called
-   * @para pid peer identity,
+   * @param pid peer identity,
    *    pointer will remain valid until @e disconnect_cb is called
    * @param[out] ctx storage space for DHT to use in association with this target
    */
diff --git a/src/include/gnunet_disk_lib.h b/src/include/gnunet_disk_lib.h
index 71c1f88a5..c76cdc231 100644
--- a/src/include/gnunet_disk_lib.h
+++ b/src/include/gnunet_disk_lib.h
@@ -674,7 +674,7 @@ GNUNET_DISK_directory_scan (const char *dir_name,
  * Currently, the glob_pattern only supports asterisks in the last
  * path component.
  *
- * @param glob_patterb the glob pattern to search for
+ * @param glob_pattern the glob pattern to search for
  * @param callback the method to call for each file
  * @param callback_cls closure for @a callback
  * @return the number of files found, -1 on error
diff --git a/src/include/gnunet_dnsstub_lib.h b/src/include/gnunet_dnsstub_lib.h
index 1310ce55a..4cc5e7fd0 100644
--- a/src/include/gnunet_dnsstub_lib.h
+++ b/src/include/gnunet_dnsstub_lib.h
@@ -89,7 +89,7 @@ GNUNET_DNSSTUB_add_dns_sa (struct GNUNET_DNSSTUB_Context *ctx,
  * Only effective for requests issued after this call.
  *
  * @param ctx resolver context to modify
- * @param retry_frequ how long to wait between retries
+ * @param retry_freq how long to wait between retries
  */
 void
 GNUNET_DNSSTUB_set_retry (struct GNUNET_DNSSTUB_Context *ctx,
diff --git a/src/include/gnunet_friends_lib.h b/src/include/gnunet_friends_lib.h
index d591ea082..03fa6c72d 100644
--- a/src/include/gnunet_friends_lib.h
+++ b/src/include/gnunet_friends_lib.h
@@ -19,6 +19,9 @@
  */
 
 /**
+ * @addtogroup Backbone 
+ * @{
+ *
  * @author Christian Grothoff
  *
  * @file
@@ -116,3 +119,5 @@ GNUNET_FRIENDS_write (struct GNUNET_FRIENDS_Writer *w,
 #endif
 
 /** @} */  /* end of group */
+
+/** @} */  /* end of group addition to backbone */
diff --git a/src/include/gnunet_fs_service.h b/src/include/gnunet_fs_service.h
index 6b664169a..8ae826380 100644
--- a/src/include/gnunet_fs_service.h
+++ b/src/include/gnunet_fs_service.h
@@ -111,7 +111,7 @@ typedef int
  * into HashMaps.  The key may change between FS implementations.
  *
  * @param uri uri to convert to a unique key
- * @param key wherer to store the unique key
+ * @param key where to store the unique key
  * @return #GNUNET_OK on success
  */
 int
@@ -464,7 +464,7 @@ GNUNET_FS_GETOPT_KEYWORDS (char shortName,
  * @param name long name of the option
  * @param argumentHelp help text for the option argument
  * @param description long help text for the option
- * @param[out] metadata set to the desired value
+ * @param[out] meta metadata set to the desired value
  */
 struct GNUNET_GETOPT_CommandLineOption
 GNUNET_FS_GETOPT_METADATA (char shortName,
diff --git a/src/include/gnunet_getopt_lib.h b/src/include/gnunet_getopt_lib.h
index c7c1d57a3..87ad591b7 100644
--- a/src/include/gnunet_getopt_lib.h
+++ b/src/include/gnunet_getopt_lib.h
@@ -404,7 +404,6 @@ GNUNET_GETOPT_option_timestamp (char shortName,
  *
  * @param shortName short name of the option
  * @param name long name of the option
- * @param argumentHelp help text for the option argument
  * @param description long help text for the option
  * @param[out] val set to 1 if the option is present
  */
diff --git a/src/include/gnunet_gns_service.h b/src/include/gnunet_gns_service.h
index d367ac076..a32bb77ae 100644
--- a/src/include/gnunet_gns_service.h
+++ b/src/include/gnunet_gns_service.h
@@ -238,3 +238,5 @@ GNUNET_GNS_lookup_with_tld_cancel (struct GNUNET_GNS_LookupWithTldRequest *ltr);
 #endif
 
 /** @} */ /* end of group */
+
+/** @} */ /* end of group addition */
diff --git a/src/include/gnunet_gnsrecord_lib.h b/src/include/gnunet_gnsrecord_lib.h
index 21fb610f3..357f87587 100644
--- a/src/include/gnunet_gnsrecord_lib.h
+++ b/src/include/gnunet_gnsrecord_lib.h
@@ -528,6 +528,7 @@ GNUNET_GNSRECORD_query_from_private_key (
 
 /**
  * Calculate the DHT query for a given @a label in a given @a zone.
+ * FIXME: We may want to plugin-ize this at some point.
  *
  * @param pub public key of the zone
  * @param label label of the record
@@ -752,7 +753,7 @@ GNUNET_GNSRECORD_is_critical (uint32_t type);
  * @param rd input records
  * @param rd_count size of the @a rd and @a rd_public arrays
  * @param rd_public where to write the converted records
- * @param rd_public_count number of records written to @a rd_public
+ * @param rd_count_public number of records written to @a rd_public
  * @param min_expiry the minimum expiration of this set
  * @param filter the record set filter, see GNUNET_GNSRECORD_Filter.
  * @param emsg the error message if something went wrong
@@ -768,7 +769,6 @@ GNUNET_GNSRECORD_normalize_record_set (const char *label,
                                        enum GNUNET_GNSRECORD_Filter filter,
                                        char **emsg);
 
-
 /**
  * Check label for invalid characters.
  *
diff --git a/src/include/gnunet_hello_lib.h b/src/include/gnunet_hello_lib.h
index b12108a33..86bf35110 100644
--- a/src/include/gnunet_hello_lib.h
+++ b/src/include/gnunet_hello_lib.h
@@ -485,8 +485,8 @@ GNUNET_HELLO_parse_uri (const char *uri,
  * @param nt network type of @a address
  * @param mono_time when was @a address valid
  * @param private_key signing key to use
- * @param result[out] where to write address record (allocated)
- * @param result_size[out] set to size of @a result
+ * @param[out] result where to write address record (allocated)
+ * @param[out] result_size set to size of @a result
  */
 void
 GNUNET_HELLO_sign_address (
@@ -504,8 +504,8 @@ GNUNET_HELLO_sign_address (
  * @param raw raw signed address
  * @param raw_size size of @a raw
  * @param pid public key to use for signature verification
- * @param nt[out] set to network type
- * @param mono_time[out] when was the address generated
+ * @param[out] nt set to network type
+ * @param[out] mono_time when was the address generated
  * @return NULL on error, otherwise the address
  */
 char *
diff --git a/src/include/gnunet_json_lib.h b/src/include/gnunet_json_lib.h
index af63c5e42..8809afb71 100644
--- a/src/include/gnunet_json_lib.h
+++ b/src/include/gnunet_json_lib.h
@@ -129,7 +129,7 @@ struct GNUNET_JSON_Specification
  * @param root the JSON node to start the navigation at.
  * @param spec parse specification array
  * @param[out] error_json_name which JSON field was problematic
- * @param[out] which index into @a spec did we encounter an error
+ * @param[out] error_line which index into @a spec did we encounter an error
  * @return #GNUNET_OK on success, #GNUNET_SYSERR on error
  */
 enum GNUNET_GenericReturnValue
@@ -338,7 +338,7 @@ GNUNET_JSON_spec_boolean (const char *name,
  * Timestamp.
  *
  * @param name name of the JSON field
- * @param[out] at where to store the absolute time found under @a name
+ * @param[out] t at where to store the absolute time found under @a name
  */
 struct GNUNET_JSON_Specification
 GNUNET_JSON_spec_timestamp (const char *name,
diff --git a/src/include/gnunet_load_lib.h b/src/include/gnunet_load_lib.h
index ef596807a..397d3aa2d 100644
--- a/src/include/gnunet_load_lib.h
+++ b/src/include/gnunet_load_lib.h
@@ -19,6 +19,9 @@
  */
 
 /**
+ * @addtogroup libgnunetutil
+ * @{
+ *
  * @author Christian Grothoff
  *
  * @file
@@ -124,4 +127,6 @@ GNUNET_LOAD_update (struct GNUNET_LOAD_Value *load, uint64_t data);
 
 /** @} */  /* end of group */
 
+/** @} */  /* end of group addition to libgnunetutil */
+
 /* end of gnunet_load_lib.h */
diff --git a/src/include/gnunet_messenger_service.h b/src/include/gnunet_messenger_service.h
index f8bbc7398..12f021d35 100644
--- a/src/include/gnunet_messenger_service.h
+++ b/src/include/gnunet_messenger_service.h
@@ -613,9 +613,9 @@ typedef int
  * @param[in] cfg Configuration to use
  * @param[in] name Name to look up an ego or NULL to stay anonymous
  * @param[in] identity_callback Function called when the EGO of the handle changes
- * @param[in/out] identity_cls Closure for the <i>identity_callback</i> handler
+ * @param[in,out] identity_cls Closure for the <i>identity_callback</i> handler
  * @param[in] msg_callback Function called when a new message is sent or received
- * @param[in/out] msg_cls Closure for the <i>msg_callback</i> handler
+ * @param[in,out] msg_cls Closure for the <i>msg_callback</i> handler
  * @return Messenger handle to use, NULL on error
  */
 struct GNUNET_MESSENGER_Handle*
@@ -634,7 +634,7 @@ GNUNET_MESSENGER_connect (const struct GNUNET_CONFIGURATION_Handle *cfg,
  * Keep in mind that this will fully delete the old ego key (if any is used) even if any other service wants to use it
  * as default.
  *
- * @param[in/out] handle Messenger handle to use
+ * @param[in,out] handle Messenger handle to use
  * @return #GNUNET_OK on success, #GNUNET_SYSERR on failure
  */
 int
@@ -643,7 +643,7 @@ GNUNET_MESSENGER_update (struct GNUNET_MESSENGER_Handle *handle);
 /**
  * Disconnect all of the messengers used services and clears up its used memory.
  *
- * @param[in/out] handle Messenger handle to use
+ * @param[in,out] handle Messenger handle to use
  */
 void
 GNUNET_MESSENGER_disconnect (struct GNUNET_MESSENGER_Handle *handle);
@@ -662,7 +662,7 @@ GNUNET_MESSENGER_get_name (const struct GNUNET_MESSENGER_Handle *handle);
  * name to its new directory. If anything fails during this process the function returns #GNUNET_NO and the name for
  * the messenger won't change as specified.
  *
- * @param[in/out] handle Messenger handle to use
+ * @param[in,out] handle Messenger handle to use
  * @param[in] name Name for the messenger to change to
  * @return #GNUNET_YES on success, #GNUNET_NO on failure and #GNUNET_SYSERR if <i>handle</i> is NULL
  */
@@ -691,7 +691,7 @@ GNUNET_MESSENGER_get_key (const struct GNUNET_MESSENGER_Handle *handle);
  *
  * ( All <b>doors</b> form a ring structured network to shorten the latency sending and receiving messages. )
  *
- * @param[in/out] handle Messenger handle to use
+ * @param[in,out] handle Messenger handle to use
  * @param[in] key Hash identifying the port
  * @return Room handle, NULL on error
  */
@@ -712,7 +712,7 @@ GNUNET_MESSENGER_open_room (struct GNUNET_MESSENGER_Handle *handle,
  *
  * ( All <b>doors</b> form a ring structured network to shorten the latency sending and receiving messages. )
  *
- * @param[in/out] handle Messenger handle to use
+ * @param[in,out] handle Messenger handle to use
  * @param[in] door Peer identity of an open <b>door</b>
  * @param[in] key Hash identifying the port
  * @return Room handle, NULL on error
@@ -729,7 +729,7 @@ GNUNET_MESSENGER_enter_room (struct GNUNET_MESSENGER_Handle *handle,
  * ( After a member closes a <b>door</b>, all members entered through that specific <b>door</b> have to use another one
  * or open the room on their own. )
  *
- * @param[in/out] room Room handle
+ * @param[in,out] room Room handle
  */
 void
 GNUNET_MESSENGER_close_room (struct GNUNET_MESSENGER_Room *room);
@@ -792,7 +792,7 @@ const struct GNUNET_IDENTITY_PublicKey*
 GNUNET_MESSENGER_contact_get_key (const struct GNUNET_MESSENGER_Contact *contact);
 
 /**
- * Send a <i>message</i> into a </i>room</i>. If you opened the <i>room</i> all entered members will receive the
+ * Send a <i>message</i> into a <i>room</i>. If you opened the <i>room</i> all entered members will receive the
  * <i>message</i>. If you entered the <i>room</i> through a <b>door</b> all so entered <b>doors</b> will receive the
  * <i>message</i> as well. All members receiving the <i>message</i> will also propagate this <i>message</i> recursively
  * as long as the <i>message</i> is unknown to them.
@@ -805,7 +805,7 @@ GNUNET_MESSENGER_contact_get_key (const struct GNUNET_MESSENGER_Contact *contact
  *
  * Sending a message to all members in a given room can be done by providing NULL as contact.
  *
- * @param[in/out] room Room handle
+ * @param[in,out] room Room handle
  * @param[in] message New message to send
  * @param[in] contact Contact or NULL
  */
diff --git a/src/include/gnunet_mq_lib.h b/src/include/gnunet_mq_lib.h
index bf2902707..a06fb4eb7 100644
--- a/src/include/gnunet_mq_lib.h
+++ b/src/include/gnunet_mq_lib.h
@@ -390,9 +390,9 @@ typedef void
  * FIFO of envelopes independent of MQ itself and wants to
  * re-use the pointers internal to @a env.  Use with caution.
  *
- * @param[in|out] env_head of envelope DLL
- * @param[in|out] env_tail tail of envelope DLL
- * @param[in|out] env element to insert at the tail
+ * @param[in,out] env_head of envelope DLL
+ * @param[in,out] env_tail tail of envelope DLL
+ * @param[in,out] env element to insert at the tail
  */
 void
 GNUNET_MQ_dll_insert_head (struct GNUNET_MQ_Envelope **env_head,
@@ -408,9 +408,9 @@ GNUNET_MQ_dll_insert_head (struct GNUNET_MQ_Envelope **env_head,
  * FIFO of envelopes independent of MQ itself and wants to
  * re-use the pointers internal to @a env.  Use with caution.
  *
- * @param[in|out] env_head of envelope DLL
- * @param[in|out] env_tail tail of envelope DLL
- * @param[in|out] env element to insert at the tail
+ * @param[in,out] env_head of envelope DLL
+ * @param[in,out] env_tail tail of envelope DLL
+ * @param[in,out] env element to insert at the tail
  */
 void
 GNUNET_MQ_dll_insert_tail (struct GNUNET_MQ_Envelope **env_head,
@@ -426,9 +426,9 @@ GNUNET_MQ_dll_insert_tail (struct GNUNET_MQ_Envelope **env_head,
  * FIFO of envelopes independent of MQ itself and wants to
  * re-use the pointers internal to @a env.  Use with caution.
  *
- * @param[in|out] env_head of envelope DLL
- * @param[in|out] env_tail tail of envelope DLL
- * @param[in|out] env element to remove from the DLL
+ * @param[in,out] env_head of envelope DLL
+ * @param[in,out] env_tail tail of envelope DLL
+ * @param[in,out] env element to remove from the DLL
  */
 void
 GNUNET_MQ_dll_remove (struct GNUNET_MQ_Envelope **env_head,
@@ -601,6 +601,7 @@ struct GNUNET_MQ_MessageHandler
  *                         "context"),
  *   GNUNET_MQ_handler_end()
  * };
+ * </code>
  *
  * @param name unique basename for the functions
  * @param code message type constant
diff --git a/src/include/gnunet_mst_lib.h b/src/include/gnunet_mst_lib.h
index 36b1fd8d5..43a8ab838 100644
--- a/src/include/gnunet_mst_lib.h
+++ b/src/include/gnunet_mst_lib.h
@@ -168,6 +168,8 @@ GNUNET_MST_destroy (struct GNUNET_MessageStreamTokenizer *mst);
 
 /** @} */  /* end of group server */
 
-/** @} */ /* end of group addition */
+/** @} */ /* end of group addition to networking */
+
+/** @} */ /* end of group addition to libgnunetutil*/
 
 /* end of gnunet_mst_lib.h */
diff --git a/src/include/gnunet_my_lib.h b/src/include/gnunet_my_lib.h
index 0c95d50d0..96d8cab42 100644
--- a/src/include/gnunet_my_lib.h
+++ b/src/include/gnunet_my_lib.h
@@ -18,6 +18,9 @@
      SPDX-License-Identifier: AGPL3.0-or-later
  */
 /**
+ * @addtogroup lib_extra 
+ * @{
+ *
  * @author Christian Grothoff
  * @author Christophe Genevey
  *
@@ -126,7 +129,7 @@ struct GNUNET_MY_QueryParam
  * @a ptr_size bytes.FG
  *
  * @param ptr pointer to the query parameter to pass
- * @oaran ptr_size number of bytes in @a ptr
+ * @param ptr_size number of bytes in @a ptr
  */
 struct GNUNET_MY_QueryParam
 GNUNET_MY_query_param_fixed_size (const void *ptr,
@@ -262,7 +265,7 @@ struct GNUNET_MY_ResultSpec
  * MySQL, store in already allocated buffer at @a ptr.
  *
  * @spec ptr where to write the result
- * @oaran ptr_size number of bytes available at @a ptr
+ * @param ptr_size number of bytes available at @a ptr
  */
 struct GNUNET_MY_ResultSpec
 GNUNET_MY_result_spec_fixed_size (void *ptr,
@@ -271,7 +274,7 @@ GNUNET_MY_result_spec_fixed_size (void *ptr,
 /**
  * Generate query parameter for a string
  *
- *@param ptr pointer to the string query parameter to pass
+ * @param ptr pointer to the string query parameter to pass
  */
 struct GNUNET_MY_QueryParam
 GNUNET_MY_query_param_string (const char *ptr);
@@ -339,7 +342,7 @@ GNUNET_MY_query_param_uint16 (const uint16_t *x);
 /**
  * Generate query parameter for an uint32_t in host byte order
  *
- *@param x pointer to the query parameter to pass
+ * @param x pointer to the query parameter to pass
  */
 struct GNUNET_MY_QueryParam
 GNUNET_MY_query_param_uint32 (const uint32_t *x);
@@ -347,7 +350,7 @@ GNUNET_MY_query_param_uint32 (const uint32_t *x);
 /**
  * Generate query parameter for an uint64_t in host byte order
  *
- *@param x pointer to the query parameter to pass
+ * @param x pointer to the query parameter to pass
  */
 struct GNUNET_MY_QueryParam
 GNUNET_MY_query_param_uint64 (const uint64_t *x);
@@ -367,8 +370,8 @@ GNUNET_MY_query_param_uint64 (const uint64_t *x);
  * Variable-size result expected
  *
  * @param[out] dst where to store the result, allocated
- * @param[out] sptr where to store the size of @a dst
- * @return array entru for the result specification to use
+ * @param[out] ptr_size where to store the size of @a dst
+ * @return array entry for the result specification to use
  */
 struct GNUNET_MY_ResultSpec
 GNUNET_MY_result_spec_variable_size (void **dst,
@@ -498,3 +501,5 @@ GNUNET_MY_cleanup_result (struct GNUNET_MY_ResultSpec *rs);
 #endif
 
 /** @} */  /* end of group */
+
+/** @} */  /* end of group addition to lib_extra */
diff --git a/src/include/gnunet_nat_auto_service.h b/src/include/gnunet_nat_auto_service.h
index 78284dc01..db3a8460d 100644
--- a/src/include/gnunet_nat_auto_service.h
+++ b/src/include/gnunet_nat_auto_service.h
@@ -26,7 +26,7 @@
  * Service for testing and autoconfiguration of
  * NAT traversal functionality
  *
- * @defgroup nat  NAT testing library
+ * @defgroup nat  NAT library
  *
  * @{
  */
diff --git a/src/include/gnunet_nc_lib.h b/src/include/gnunet_nc_lib.h
index 7eef49900..dbd2aa12f 100644
--- a/src/include/gnunet_nc_lib.h
+++ b/src/include/gnunet_nc_lib.h
@@ -104,4 +104,6 @@ GNUNET_notification_context_get_size (struct GNUNET_NotificationContext *nc);
 
 #endif
 
+/** @} */ /* end of group mq */
+
 /** @} */ /* end of group addition */
diff --git a/src/include/gnunet_nt_lib.h b/src/include/gnunet_nt_lib.h
index 5c3ec86af..144a3daa3 100644
--- a/src/include/gnunet_nt_lib.h
+++ b/src/include/gnunet_nt_lib.h
@@ -18,6 +18,9 @@
      SPDX-License-Identifier: AGPL3.0-or-later
  */
 /**
+ * @addtogroup Backbone
+ * @{
+ *
  * @file network type characterization
  * @author Christian Grothoff
  * @author Matthias Wachs
@@ -122,3 +125,5 @@ GNUNET_NT_scanner_done (struct GNUNET_NT_InterfaceScanner *is);
 #endif
 
 /** @} */  /* end of group */
+
+/** @} */  /* end of group addition to backbone */
diff --git a/src/include/gnunet_peerinfo_service.h b/src/include/gnunet_peerinfo_service.h
index 739e7ed24..3be4a6977 100644
--- a/src/include/gnunet_peerinfo_service.h
+++ b/src/include/gnunet_peerinfo_service.h
@@ -142,7 +142,6 @@ struct GNUNET_PEERINFO_IteratorContext;
  * @param h handle to the peerinfo service
  * @param include_friend_only include HELLO messages for friends only
  * @param peer restrict iteration to this peer only (can be NULL)
- * @param timeout how long to wait until timing out
  * @param callback the method to call for each peer
  * @param callback_cls closure for @a callback
  * @return iterator context
diff --git a/src/include/gnunet_peerstore_service.h b/src/include/gnunet_peerstore_service.h
index deea3ae96..f9b283a9f 100644
--- a/src/include/gnunet_peerstore_service.h
+++ b/src/include/gnunet_peerstore_service.h
@@ -249,6 +249,7 @@ GNUNET_PEERSTORE_store_cancel (struct GNUNET_PEERSTORE_StoreContext *sc);
  * @param key entry key string (can be NULL)
  * @param callback function called with each matching record, all NULL's on end
  * @param callback_cls closure for @a callback
+ * @return Handle to iteration request
  */
 struct GNUNET_PEERSTORE_IterateContext *
 GNUNET_PEERSTORE_iterate (struct GNUNET_PEERSTORE_Handle *h,
diff --git a/src/include/gnunet_pq_lib.h b/src/include/gnunet_pq_lib.h
index 7396c6861..d52c0e40d 100644
--- a/src/include/gnunet_pq_lib.h
+++ b/src/include/gnunet_pq_lib.h
@@ -118,7 +118,7 @@ GNUNET_PQ_query_param_null (void);
  * @a ptr_size bytes.
  *
  * @param ptr pointer to the query parameter to pass
- * @oaran ptr_size number of bytes in @a ptr
+ * @param ptr_size number of bytes in @a ptr
  * @return query parameter to use
  */
 struct GNUNET_PQ_QueryParam
@@ -235,7 +235,7 @@ GNUNET_PQ_query_param_absolute_time_nbo (
  */
 struct GNUNET_PQ_QueryParam
 GNUNET_PQ_query_param_timestamp_nbo (
-  const struct GNUNET_TIME_TimestampNBO *t);
+  const struct GNUNET_TIME_TimestampNBO *x);
 
 
 /**
@@ -861,7 +861,7 @@ GNUNET_PQ_make_try_execute (const char *sql);
 /**
  * Request execution of an array of statements @a es from Postgres.
  *
- * @param pq database to execute the statements in
+ * @param db database to execute the statements in
  * @param es #GNUNET_PQ_PREPARED_STATEMENT_END-terminated array of prepared
  *            statements.
  * @return #GNUNET_OK on success (modulo statements where errors can be ignored)
@@ -903,14 +903,14 @@ enum GNUNET_PQ_Options
  * configuration.  Initialize logging via GNUnet's log routines and disable
  * Postgres's logger.  Also ensures that the statements in @a load_path and @a
  * es are executed whenever we (re)connect to the database, and that the
- * prepared statements in @a ps are "ready".  If statements in @es fail that
+ * prepared statements in @a ps are "ready".  If statements in @a es fail that
  * were created with #GNUNET_PQ_make_execute(), then the entire operation
  * fails.
  *
  * In @a load_path, a list of "$XXXX.sql" files is expected where $XXXX
  * must be a sequence of contiguous integer values starting at 0000.
  * These files are then loaded in sequence using "psql $config_str" before
- * running statements from @e es.  The directory is inspected again on
+ * running statements from @a es.  The directory is inspected again on
  * reconnect.
  *
  * @param config_str configuration to use
@@ -947,7 +947,7 @@ GNUNET_PQ_exec_sql (struct GNUNET_PQ_Context *db,
  * configuration.  Initialize logging via GNUnet's log routines and disable
  * Postgres's logger.  Also ensures that the statements in @a load_path and @a
  * es are executed whenever we (re)connect to the database, and that the
- * prepared statements in @a ps are "ready".  If statements in @es fail that
+ * prepared statements in @a ps are "ready".  If statements in @a es fail that
  * were created with #GNUNET_PQ_make_execute(), then the entire operation
  * fails.
  *
diff --git a/src/include/gnunet_reclaim_lib.h b/src/include/gnunet_reclaim_lib.h
index 0d5ef59b7..35b58cd0e 100644
--- a/src/include/gnunet_reclaim_lib.h
+++ b/src/include/gnunet_reclaim_lib.h
@@ -515,7 +515,7 @@ GNUNET_RECLAIM_attribute_number_to_typename (uint32_t type);
 /**
  * Get required size for serialization buffer
  *
- * @param attrs the attribute list to serialize
+ * @param credentials the attribute list to serialize
  * @return the required buffer size
  */
 size_t
@@ -524,9 +524,9 @@ GNUNET_RECLAIM_credential_list_serialize_get_size (
 
 
 /**
- * Destroy claim list
+ * Destroy credential list
  *
- * @param attrs list to destroy
+ * @param credentials list to destroy
  */
 void
 GNUNET_RECLAIM_credential_list_destroy (
@@ -551,15 +551,15 @@ GNUNET_RECLAIM_credential_list_add (
 
 
 /**
- * Serialize an attribute list
+ * Serialize a credential list
  *
- * @param attrs the attribute list to serialize
- * @param result the serialized attribute
+ * @param credentials the credential list to serialize
+ * @param result the serialized credential
  * @return length of serialized data
  */
 size_t
 GNUNET_RECLAIM_credential_list_serialize (
-  const struct GNUNET_RECLAIM_CredentialList *attrs,
+  const struct GNUNET_RECLAIM_CredentialList *credentials,
   char *result);
 
 
diff --git a/src/include/gnunet_reclaim_service.h b/src/include/gnunet_reclaim_service.h
index 9f348a1cb..e9e0f144d 100644
--- a/src/include/gnunet_reclaim_service.h
+++ b/src/include/gnunet_reclaim_service.h
@@ -200,7 +200,7 @@ GNUNET_RECLAIM_attribute_store (
    *
    * @param h handle to the re:claimID service
    * @param pkey private key of the identity
-   * @param attr the credential value
+   * @param credential the credential value
    * @param exp_interval the relative expiration interval for the credential
    * @param cont continuation to call when done
    * @param cont_cls closure for @a cont
@@ -235,7 +235,7 @@ GNUNET_RECLAIM_attribute_delete (
   GNUNET_RECLAIM_ContinuationWithStatus cont, void *cont_cls);
 
 /**
- * Delete a credential. Tickets used to share use a presentation of this
+ * Delete a credential. Tickets used to share a presentation of this
  * credential are updated accordingly.
  *
  * @param h handle to the re:claimID service
@@ -349,7 +349,7 @@ GNUNET_RECLAIM_get_credentials_start (
  * Calls the record processor specified in #GNUNET_RECLAIM_get_credentials_start
  * for the next record.
  *
- * @param it the iterator
+ * @param ait the iterator
  */
 void
 GNUNET_RECLAIM_get_credentials_next (
@@ -361,7 +361,7 @@ GNUNET_RECLAIM_get_credentials_next (
  * be called on any iteration that has not yet completed prior to calling
  * #GNUNET_RECLAIM_disconnect.
  *
- * @param it the iterator
+ * @param ait the iterator
  */
 void
 GNUNET_RECLAIM_get_credentials_stop (
diff --git a/src/include/gnunet_resolver_service.h b/src/include/gnunet_resolver_service.h
index 956e4d67e..80c92dc4e 100644
--- a/src/include/gnunet_resolver_service.h
+++ b/src/include/gnunet_resolver_service.h
@@ -19,6 +19,9 @@
  */
 
 /**
+ * @addtogroup vpn_suite
+ * @{
+ *
  * @author Christian Grothoff
  *
  * @file
@@ -178,4 +181,6 @@ GNUNET_RESOLVER_request_cancel (struct GNUNET_RESOLVER_RequestHandle *rh);
 
 /** @} */  /* end of group resolver */
 
+/** @} */  /* end of group addition to vpn_suite */
+
 /* end of gnunet_resolver_service.h */
diff --git a/src/include/gnunet_scalarproduct_service.h b/src/include/gnunet_scalarproduct_service.h
index 1d775f659..7f60bb325 100644
--- a/src/include/gnunet_scalarproduct_service.h
+++ b/src/include/gnunet_scalarproduct_service.h
@@ -179,7 +179,7 @@ GNUNET_SCALARPRODUCT_start_computation (
 struct GNUNET_SCALARPRODUCT_ComputationHandle *
 GNUNET_SCALARPRODUCT_accept_computation (
   const struct GNUNET_CONFIGURATION_Handle *cfg,
-  const struct GNUNET_HashCode *key,
+  const struct GNUNET_HashCode *session_key,
   const struct GNUNET_SCALARPRODUCT_Element *elements,
   uint32_t element_count,
   GNUNET_SCALARPRODUCT_ContinuationWithStatus cont,
diff --git a/src/include/gnunet_service_lib.h b/src/include/gnunet_service_lib.h
index 5baa9100e..8c8591af0 100644
--- a/src/include/gnunet_service_lib.h
+++ b/src/include/gnunet_service_lib.h
@@ -282,8 +282,8 @@ GNUNET_SERVICE_run_ (int argc,
  * #GNUNET_SERVICE_client_drop().
  *
  * @param service_name name of the service to run
- * @param options options controlling shutdown of the service
- * @param service_init_cb function to call once the service is ready
+ * @param service_options options controlling shutdown of the service
+ * @param init_cb function to call once the service is ready
  * @param connect_cb function to call whenever a client connects
  * @param disconnect_cb function to call whenever a client disconnects
  * @param cls closure argument for @a service_init_cb, @a connect_cb and @a disconnect_cb
@@ -449,6 +449,8 @@ GNUNET_SERVICE_client_persist (struct GNUNET_SERVICE_Client *c);
 
 /** @} */  /* end of group service */
 
-/** @} */ /* end of group addition */
+/** @} */ /* end of group addition to networking*/
+
+/** @} */ /* end of group addition to libgnunetutil */
 
 /* end of gnunet_service_lib.h */
diff --git a/src/include/gnunet_set_service.h b/src/include/gnunet_set_service.h
index 25e3e9630..255eef265 100644
--- a/src/include/gnunet_set_service.h
+++ b/src/include/gnunet_set_service.h
@@ -368,10 +368,10 @@ GNUNET_SET_add_element (struct GNUNET_SET_Handle *set,
 
 
 /**
- * Remove an element to the given set.
- * After the element has been removed (in the sense of the
- * request being transmitted to the set service), cont will be called.
- * Calls to remove_element can be queued
+ * Remove an element to the given set. 
+ * After the element has been removed (in the sense of the request 
+ * being transmitted to the set service), @a cont will be called.  
+ * Multiple calls to GNUNET_SET_remove_element() can be queued
  *
  * @param set set to remove element from
  * @param element element to remove from the set
@@ -559,7 +559,7 @@ GNUNET_SET_element_dup (const struct GNUNET_SET_Element *element);
  * Hash a set element.
  *
  * @param element the element that should be hashed
- * @param ret_hash a pointer to where the hash of @a element
+ * @param[out] ret_hash a pointer to where the hash of @a element
  *        should be stored
  */
 void
diff --git a/src/include/gnunet_setu_service.h b/src/include/gnunet_setu_service.h
index fb2614bc8..89ac3cd07 100644
--- a/src/include/gnunet_setu_service.h
+++ b/src/include/gnunet_setu_service.h
@@ -291,9 +291,9 @@ GNUNET_SETU_destroy (struct GNUNET_SETU_Handle *set);
 
 
 /**
- * Prepare a set operation to be evaluated with another peer.  The evaluation
- * will not start until the client provides a local set with
- * GNUNET_SETU_commit().
+ * Prepare a set operation to be evaluated with another peer.
+ * The evaluation will not start until the client provides a 
+ * local set with GNUNET_SETU_commit().
  *
  * @param other_peer peer with the other set
  * @param app_id hash for the application using the set
diff --git a/src/include/gnunet_socks.h b/src/include/gnunet_socks.h
index 1a6ae1119..b82943da3 100644
--- a/src/include/gnunet_socks.h
+++ b/src/include/gnunet_socks.h
@@ -19,6 +19,9 @@
  */
 
 /**
+ * @addtogroup libgnunetutil
+ * @{
+ *
  * @author Jeffrey Burdges
  *
  * @file
@@ -81,4 +84,6 @@ GNUNET_SOCKS_do_connect (const char *service_name,
 
 /** @} */  /* end of group */
 
+/** @} */  /* end of group addition to libgnunetutil */
+
 /* end of gnunet_socks.h */
diff --git a/src/include/gnunet_sq_lib.h b/src/include/gnunet_sq_lib.h
index 51713e755..3406b9031 100644
--- a/src/include/gnunet_sq_lib.h
+++ b/src/include/gnunet_sq_lib.h
@@ -91,7 +91,7 @@ struct GNUNET_SQ_QueryParam
  * @a ptr_size bytes.
  *
  * @param ptr pointer to the query parameter to pass
- * @oaran ptr_size number of bytes in @a ptr
+ * @param ptr_size number of bytes in @a ptr
  */
 struct GNUNET_SQ_QueryParam
 GNUNET_SQ_query_param_fixed_size (const void *ptr,
diff --git a/src/include/gnunet_strings_lib.h b/src/include/gnunet_strings_lib.h
index e96888db5..7e06768b8 100644
--- a/src/include/gnunet_strings_lib.h
+++ b/src/include/gnunet_strings_lib.h
@@ -403,7 +403,7 @@ GNUNET_STRINGS_base64_encode (const void *in,
  *
  * @param data the data to decode
  * @param len the length of the input
- * @param output where to write the output (*output should be NULL,
+ * @param out where to write the output (*out should be NULL,
  *   is allocated)
  * @return the size of the output
  */
@@ -448,7 +448,7 @@ GNUNET_STRINGS_base64_decode (const char *data,
  *
  * @param data the data to decode
  * @param len the length of the input
- * @param output where to write the output (*output should be NULL,
+ * @param out where to write the output (*out should be NULL,
  *   is allocated)
  * @return the size of the output
  */
diff --git a/src/include/gnunet_testbed_service.h b/src/include/gnunet_testbed_service.h
index 29515b7af..ef67ab8ca 100644
--- a/src/include/gnunet_testbed_service.h
+++ b/src/include/gnunet_testbed_service.h
@@ -1030,8 +1030,8 @@ enum GNUNET_TESTBED_TopologyOption
  * Configure overall network topology to have a particular shape.
  *
  * @param op_cls closure argument to give with the operation event
- * @param num_peers number of peers in 'peers'
- * @param peers array of 'num_peers' with the peers to configure
+ * @param num_peers number of peers in @a peers
+ * @param peers array of @a num_peers with the peers to configure
  * @param topo desired underlay topology to use
  * @param ap topology-specific options
  * @return handle to the operation, NULL if configuring the topology
@@ -1052,8 +1052,8 @@ GNUNET_TESTBED_underlay_configure_topology_va (void *op_cls,
  * Configure overall network topology to have a particular shape.
  *
  * @param op_cls closure argument to give with the operation event
- * @param num_peers number of peers in 'peers'
- * @param peers array of 'num_peers' with the peers to configure
+ * @param num_peers number of peers in @a peers
+ * @param peers array of @a num_peers with the peers to configure
  * @param topo desired underlay topology to use
  * @param ... topology-specific options
  * @return handle to the operation, NULL if configuring the topology
diff --git a/src/include/gnunet_testing_lib.h b/src/include/gnunet_testing_lib.h
index 724382c66..2f64c306b 100644
--- a/src/include/gnunet_testing_lib.h
+++ b/src/include/gnunet_testing_lib.h
@@ -401,7 +401,7 @@ typedef void
  * Starts a peer using the given configuration and then invokes the
  * given callback.  This function ALSO initializes the scheduler loop
  * and should thus be called directly from "main".  The testcase
- * should self-terminate by invoking 'GNUNET_SCHEDULER_shutdown'.
+ * should self-terminate by invoking #GNUNET_SCHEDULER_shutdown().
  *
  * @param testdir only the directory name without any path. This is used for
  *          all service homes; the directory will be created in a temporary
@@ -409,7 +409,7 @@ typedef void
  * @param cfgfilename name of the configuration file to use;
  *         use NULL to only run with defaults
  * @param tm main function of the testcase
- * @param tm_cls closure for 'tm'
+ * @param tm_cls closure for @a tm
  * @return 0 on success, 1 on error
  */
 int
@@ -425,7 +425,7 @@ GNUNET_TESTING_peer_run (const char *testdir,
  * Starts a service using the given configuration and then invokes the
  * given callback.  This function ALSO initializes the scheduler loop
  * and should thus be called directly from "main".  The testcase
- * should self-terminate by invoking 'GNUNET_SCHEDULER_shutdown'.
+ * should self-terminate by invoking #GNUNET_SCHEDULER_shutdown().
  *
  * This function is useful if the testcase is for a single service
  * and if that service doesn't itself depend on other services.
diff --git a/src/include/gnunet_testing_netjail_lib.h b/src/include/gnunet_testing_netjail_lib.h
index ea44e030d..f736e1b42 100644
--- a/src/include/gnunet_testing_netjail_lib.h
+++ b/src/include/gnunet_testing_netjail_lib.h
@@ -470,12 +470,11 @@ GNUNET_TESTING_cmd_stop_testing_system (
   const char *helper_start_label,
   struct GNUNET_TESTING_NetjailTopology *topology);
 
-
 /**
  * Create a GNUNET_CMDS_LOCAL_FINISHED message.
  *
  * @return The GNUNET_CMDS_LOCAL_FINISHED message.
-*/
+ */
 struct GNUNET_MessageHeader *
 GNUNET_TESTING_send_local_test_finished_msg ();
 
@@ -546,7 +545,6 @@ GNUNET_TESTING_cmd_local_test_finished (
  *
  * @param label name for command.
  * @param write_message Callback to write messages to the master loop.
- * @param all_local_tests_prepared Flag which will be set from outside.
  * @return command.
  */
 struct GNUNET_TESTING_Command
diff --git a/src/include/gnunet_testing_ng_lib.h b/src/include/gnunet_testing_ng_lib.h
index 1bc66e59d..d810a5342 100644
--- a/src/include/gnunet_testing_ng_lib.h
+++ b/src/include/gnunet_testing_ng_lib.h
@@ -415,7 +415,7 @@ GNUNET_TESTING_interpreter_get_current_command (
 /**
  * Check if the command is running.
  *
- * @param cmd The command to check.
+ * @param command The command to check.
  * @return GNUNET_NO if the command is not running, GNUNET_YES if it is running.
  */
 enum GNUNET_GenericReturnValue
@@ -425,7 +425,7 @@ GNUNET_TESTING_running (const struct GNUNET_TESTING_Command *command);
 /**
  * Check if a command is finished.
  *
- * @param cmd The command to check.
+ * @param command The command to check.
  * @return GNUNET_NO if the command is not finished, GNUNET_YES if it is finished.
  */
 enum GNUNET_GenericReturnValue
diff --git a/src/include/gnunet_time_lib.h b/src/include/gnunet_time_lib.h
index d753d62f7..e66ce6ea9 100644
--- a/src/include/gnunet_time_lib.h
+++ b/src/include/gnunet_time_lib.h
@@ -242,7 +242,7 @@ GNUNET_TIME_timestamp2s (struct GNUNET_TIME_Timestamp ts);
  * Note that the returned value will be overwritten if this function
  * is called again.
  *
- * @param t the absolute time to convert
+ * @param ts the absolute time to convert
  * @return timestamp in human-readable form in local time
  */
 const char *
diff --git a/src/include/gnunet_transport_application_service.h b/src/include/gnunet_transport_application_service.h
index 5767082d9..9a6ddd36a 100644
--- a/src/include/gnunet_transport_application_service.h
+++ b/src/include/gnunet_transport_application_service.h
@@ -27,9 +27,7 @@
  * @author Christian Grothoff
  * @author Matthias Wachs
  *
- * @defgroup TRANSPORT service
- * Bandwidth allocation
- *
+ * @defgroup transport  Transport service
  * @{
  */
 #ifndef GNUNET_TRANSPORT_APPLICATION_SERVICE_H
diff --git a/src/include/gnunet_transport_communication_service.h b/src/include/gnunet_transport_communication_service.h
index 9b536297e..6c99de78e 100644
--- a/src/include/gnunet_transport_communication_service.h
+++ b/src/include/gnunet_transport_communication_service.h
@@ -138,7 +138,8 @@ typedef void (*GNUNET_TRANSPORT_CommunicatorNotify) (
  * Connect to the transport service.
  *
  * @param cfg configuration to use
- * @param config_section section of the configuration to use for options
+ * @param config_section_name section of the configuration to use for 
+ *                            options
  * @param addr_prefix address prefix for addresses supported by this
  *        communicator, could be NULL for incoming-only communicators
  * @param cc what characteristics does the communicator have?
@@ -283,7 +284,7 @@ GNUNET_TRANSPORT_communicator_mq_add (
  * Notify transport service that an MQ was updated
  *
  * @param ch connection to transport service
- * @param qh the queue to update
+ * @param u_qh the queue to update
  * @param q_len number of messages that can be send through this queue
  * @param priority queue priority. Queues with highest priority should be
  *                 used
diff --git a/src/include/gnunet_transport_service.h b/src/include/gnunet_transport_service.h
index 99246f136..daa79bf1c 100644
--- a/src/include/gnunet_transport_service.h
+++ b/src/include/gnunet_transport_service.h
@@ -360,8 +360,9 @@ typedef void
  * @param cfg configuration to use
  * @param peer a specific peer identity to obtain information for,
  *      NULL for all peers
- * @param one_shot #GNUNET_YES to return the current state and then end (with
- * NULL+NULL), #GNUNET_NO to monitor peers continuously
+ * @param one_shot #GNUNET_YES to return the current state and 
+ *                 then end (with NULL+NULL), 
+ *                 #GNUNET_NO to monitor peers continuously
  * @param peer_callback function to call with the results
  * @param peer_callback_cls closure for @a peer_callback
  */