diff --git a/library/src/main/java/org/mustangproject/ClassCode.java b/library/src/main/java/org/mustangproject/ClassCode.java
index b47cbdf6..8b0a58cc 100644
--- a/library/src/main/java/org/mustangproject/ClassCode.java
+++ b/library/src/main/java/org/mustangproject/ClassCode.java
@@ -54,8 +54,9 @@ public class ClassCode {
 		this(listID, code, null);
 	}
 
-	/**
+	/***
 	 * Set the version for the scheme returned by {@link #getListID()}
+	 * @param listVersionID the scheme version
 	 */
 	public void setListVersionID(String listVersionID) {
 		this.listVersionID = listVersionID;
diff --git a/library/src/main/java/org/mustangproject/Product.java b/library/src/main/java/org/mustangproject/Product.java
index 98494948..1da0292e 100644
--- a/library/src/main/java/org/mustangproject/Product.java
+++ b/library/src/main/java/org/mustangproject/Product.java
@@ -124,7 +124,7 @@ public class Product implements IZUGFeRDExportableProduct {
 	/***
 	 *
 	 * @param taxExemptionReasonText String e.g. Kleinunternehmer gemäß §19 UStG https://github.com/ZUGFeRD/mustangproject/issues/463
-	 * @return
+	 * @return fluent setter
 	 */
 	public Product setTaxExemptionReason(String  taxExemptionReasonText) {
 		taxExemptionReason = taxExemptionReasonText;
@@ -146,7 +146,7 @@ public class Product implements IZUGFeRDExportableProduct {
 	/***
 	 *
 	 * @param code e.g. S (normal tax), Z=zero rated,  E (e.g. small business) or K (intrra community supply) see also https://github.com/ZUGFeRD/mustangproject/issues/463
-	 * @return
+	 * @return fluent setter
 	 */
 	public Product setTaxCategoryCode(String  code) {
 		taxCategoryCode = code;
diff --git a/library/src/main/java/org/mustangproject/ZUGFeRD/VATAmount.java b/library/src/main/java/org/mustangproject/ZUGFeRD/VATAmount.java
index 232f6466..855e7427 100644
--- a/library/src/main/java/org/mustangproject/ZUGFeRD/VATAmount.java
+++ b/library/src/main/java/org/mustangproject/ZUGFeRD/VATAmount.java
@@ -108,6 +108,7 @@ public class VATAmount {
 	/**
      * @param documentCode as String
 	 * @deprecated Use {@link #setCategoryCode(String)} instead
+	 * @return fluent setter
 	 */
 	@Deprecated
 	public VATAmount setDocumentCode(String documentCode) {
diff --git a/library/src/main/java/org/mustangproject/util/NodeMap.java b/library/src/main/java/org/mustangproject/util/NodeMap.java
index 6afbb911..46b82a9a 100644
--- a/library/src/main/java/org/mustangproject/util/NodeMap.java
+++ b/library/src/main/java/org/mustangproject/util/NodeMap.java
@@ -36,7 +36,6 @@ import java.util.stream.Stream;
 
 /**
  * The {@link NodeMap} contains a {@link Map} representation of DOM object
- * <p />
  * It can be constructed either from the children of a single {@link Node} or a {@link NodeList}.
  */
 public class NodeMap {
@@ -44,7 +43,6 @@ public class NodeMap {
 
 	/**
 	 * Create a new {@link NodeMap}
-	 * <p />
 	 * The {@link Node} that is passed to the constructor must not be null.
 	 * The {@link NodeMap} will be empty when no child nodes are present.
 	 *
@@ -69,7 +67,6 @@ public class NodeMap {
 
 	/**
 	 * Get matching node by {@code LocalName}
-	 * <p />
 	 * In case more than one node matches, it is not guaranteed that the first match is selected
 	 *
 	 * @param localNames one or more {@code LocalName}s
@@ -81,7 +78,6 @@ public class NodeMap {
 
 	/**
 	 * Get a {@link NodeMap} of the child of a matching node by {@code LocalName}
-	 * <p />
 	 * In case more than one node matches, it is not guaranteed that the first match is selected
 	 *
 	 * @param localNames one or more {@code LocalName}s
@@ -93,7 +89,6 @@ public class NodeMap {
 
 	/**
 	 * Get the text content of a matching node
-	 * <p>
 	 * In case more than one node matches, it is not guaranteed that the first match is selected
 	 *
 	 * @param localNames one or more {@code LocalName}s
@@ -105,7 +100,6 @@ public class NodeMap {
 
 	/**
 	 * Get the text content of a matching node
-	 * <p>
 	 * In case more than one node matches, it is not guaranteed that the first match is selected
 	 *
 	 * @param localNames one or more {@code LocalName}s
@@ -117,7 +111,6 @@ public class NodeMap {
 
 	/**
 	 * Get the text content of a matching node
-	 * <p>
 	 * In case more than one node matches, it is not guaranteed that the first match is selected
 	 *
 	 * @param localNames one or more {@code LocalName}s