diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TClass.java b/teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TClass.java
index c040c4de9..f9056ae48 100644
--- a/teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TClass.java
+++ b/teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TClass.java
@@ -24,6 +24,7 @@ import org.teavm.platform.metadata.ClassScopedMetadataProvider;
 /**
  *
  * @author Alexey Andreev
+ * @param <T> class type.
  */
 public class TClass<T> extends TObject {
     TString name;
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TComparable.java b/teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TComparable.java
index c56236365..2d8489fca 100644
--- a/teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TComparable.java
+++ b/teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TComparable.java
@@ -18,6 +18,7 @@ package org.teavm.classlib.java.lang;
 /**
  *
  * @author Alexey Andreev
+ * @param <T> type this object is comparable to.
  */
 public interface TComparable<T> {
     int compareTo(T other);
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TEnum.java b/teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TEnum.java
index c1d462131..df445cbfa 100644
--- a/teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TEnum.java
+++ b/teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TEnum.java
@@ -21,6 +21,7 @@ import org.teavm.javascript.spi.Rename;
 /**
  *
  * @author Alexey Andreev
+ * @param <E> type of enum.
  */
 public abstract class TEnum<E extends TEnum<E>> extends TObject implements TComparable<E>, TSerializable {
     private TString name;
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TIterable.java b/teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TIterable.java
index 473ac0758..c99aecfb9 100644
--- a/teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TIterable.java
+++ b/teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TIterable.java
@@ -20,6 +20,7 @@ import org.teavm.classlib.java.util.TIterator;
 /**
  *
  * @author Alexey Andreev
+ * @param <T> type this collection returns.
  */
 public interface TIterable<T> {
     TIterator<T> iterator();
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TThreadLocal.java b/teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TThreadLocal.java
index 31a7be47c..ec9a3a080 100644
--- a/teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TThreadLocal.java
+++ b/teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TThreadLocal.java
@@ -18,6 +18,7 @@ package org.teavm.classlib.java.lang;
 /**
  *
  * @author Alexey Andreev
+ * @param <T> type of a value stored by thread local.
  */
 public class TThreadLocal<T> extends TObject {
     private boolean initialized;
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/lang/ref/TReference.java b/teavm-classlib/src/main/java/org/teavm/classlib/java/lang/ref/TReference.java
index ba740d223..8319691d3 100644
--- a/teavm-classlib/src/main/java/org/teavm/classlib/java/lang/ref/TReference.java
+++ b/teavm-classlib/src/main/java/org/teavm/classlib/java/lang/ref/TReference.java
@@ -20,6 +20,7 @@ import org.teavm.classlib.java.lang.TObject;
 /**
  *
  * @author Alexey Andreev
+ * @param <T> type of an object to which this reference points.
  */
 public abstract class TReference<T> extends TObject {
     public T get() {
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/lang/ref/TReferenceQueue.java b/teavm-classlib/src/main/java/org/teavm/classlib/java/lang/ref/TReferenceQueue.java
index e3b50ce9d..341572776 100644
--- a/teavm-classlib/src/main/java/org/teavm/classlib/java/lang/ref/TReferenceQueue.java
+++ b/teavm-classlib/src/main/java/org/teavm/classlib/java/lang/ref/TReferenceQueue.java
@@ -18,6 +18,7 @@ package org.teavm.classlib.java.lang.ref;
 /**
  *
  * @author Alexey Andreev
+ * @param <T>
  */
 public class TReferenceQueue<T> {
     public TReference<T> poll() {
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/lang/ref/TWeakReference.java b/teavm-classlib/src/main/java/org/teavm/classlib/java/lang/ref/TWeakReference.java
index b14232f8f..b3385efad 100644
--- a/teavm-classlib/src/main/java/org/teavm/classlib/java/lang/ref/TWeakReference.java
+++ b/teavm-classlib/src/main/java/org/teavm/classlib/java/lang/ref/TWeakReference.java
@@ -18,6 +18,7 @@ package org.teavm.classlib.java.lang.ref;
 /**
  *
  * @author Alexey Andreev
+ * @param <T>
  */
 public class TWeakReference<T> extends TReference<T> {
     private T value;
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TAbstractCollection.java b/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TAbstractCollection.java
index 6e1a2d3bb..91acd1708 100644
--- a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TAbstractCollection.java
+++ b/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TAbstractCollection.java
@@ -22,6 +22,7 @@ import org.teavm.classlib.java.lang.TUnsupportedOperationException;
 /**
  *
  * @author Alexey Andreev
+ * @param <E>
  */
 public abstract class TAbstractCollection<E> extends TObject implements TCollection<E> {
     protected TAbstractCollection() {
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TAbstractList.java b/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TAbstractList.java
index 54951b850..1b2efe4d1 100644
--- a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TAbstractList.java
+++ b/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TAbstractList.java
@@ -21,6 +21,7 @@ import org.teavm.javascript.spi.Rename;
 /**
  *
  * @author Alexey Andreev
+ * @param <E>
  */
 public abstract class TAbstractList<E> extends TAbstractCollection<E> implements TList<E> {
     protected transient int modCount;
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TAbstractMap.java b/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TAbstractMap.java
index 731f884cc..1d8f7e9bd 100644
--- a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TAbstractMap.java
+++ b/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TAbstractMap.java
@@ -23,6 +23,8 @@ import org.teavm.classlib.java.lang.TUnsupportedOperationException;
 /**
  *
  * @author Alexey Andreev
+ * @param <K>
+ * @param <V>
  */
 public abstract class TAbstractMap<K, V> extends TObject implements TMap<K, V> {
     public static class SimpleEntry<K, V> implements TMap.Entry<K, V>, TSerializable {
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TAbstractQueue.java b/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TAbstractQueue.java
index f0fe3ecdf..39a974059 100644
--- a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TAbstractQueue.java
+++ b/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TAbstractQueue.java
@@ -20,6 +20,7 @@ import org.teavm.classlib.java.lang.TIllegalStateException;
 /**
  *
  * @author Alexey Andreev
+ * @param <E>
  */
 public abstract class TAbstractQueue<E> extends TAbstractCollection<E> implements TQueue<E> {
     @Override
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TAbstractSequentialList.java b/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TAbstractSequentialList.java
index cdb095cd4..8483efbe5 100644
--- a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TAbstractSequentialList.java
+++ b/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TAbstractSequentialList.java
@@ -20,6 +20,7 @@ import org.teavm.classlib.java.lang.TIndexOutOfBoundsException;
 /**
  *
  * @author Alexey Andreev
+ * @param <E>
  */
 public abstract class TAbstractSequentialList<E> extends TAbstractList<E> {
     @Override
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TAbstractSet.java b/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TAbstractSet.java
index da20f4512..db2eb6543 100644
--- a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TAbstractSet.java
+++ b/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TAbstractSet.java
@@ -18,6 +18,7 @@ package org.teavm.classlib.java.util;
 /**
  *
  * @author Alexey Andreev
+ * @param <E>
  */
 public abstract class TAbstractSet<E> extends TAbstractCollection<E> implements TSet<E> {
     public TAbstractSet() {
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TArrayDeque.java b/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TArrayDeque.java
index 163e2e81a..e5886b777 100644
--- a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TArrayDeque.java
+++ b/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TArrayDeque.java
@@ -21,6 +21,7 @@ import org.teavm.classlib.java.lang.*;
 /**
  *
  * @author Alexey Andreev
+ * @param <E>
  */
 public class TArrayDeque<E> extends TAbstractCollection<E> implements TDeque<E> {
     private int version;
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TArrayList.java b/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TArrayList.java
index 1e4a9ad99..64702736c 100644
--- a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TArrayList.java
+++ b/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TArrayList.java
@@ -23,6 +23,7 @@ import org.teavm.javascript.spi.Rename;
 /**
  *
  * @author Alexey Andreev
+ * @param <E>
  */
 public class TArrayList<E> extends TAbstractList<E> implements TCloneable, TSerializable {
     private E[] array;
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TCollection.java b/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TCollection.java
index e604d722d..425813213 100644
--- a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TCollection.java
+++ b/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TCollection.java
@@ -20,6 +20,7 @@ import org.teavm.classlib.java.lang.TIterable;
 /**
  *
  * @author Alexey Andreev
+ * @param <E>
  */
 public interface TCollection<E> extends TIterable<E> {
     int size();
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TComparator.java b/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TComparator.java
index f068c683c..fe591fde9 100644
--- a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TComparator.java
+++ b/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TComparator.java
@@ -18,6 +18,7 @@ package org.teavm.classlib.java.util;
 /**
  *
  * @author Alexey Andreev
+ * @param <T>
  */
 public interface TComparator<T> {
     int compare(T o1, T o2);
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TDeque.java b/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TDeque.java
index 9598b0507..6352d843f 100644
--- a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TDeque.java
+++ b/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TDeque.java
@@ -18,6 +18,7 @@ package org.teavm.classlib.java.util;
 /**
  *
  * @author Alexey Andreev
+ * @param <E>
  */
 public interface TDeque<E> extends TQueue<E> {
     void addFirst(E e);
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TEnumeration.java b/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TEnumeration.java
index 89eecfebf..9bb170498 100644
--- a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TEnumeration.java
+++ b/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TEnumeration.java
@@ -18,6 +18,7 @@ package org.teavm.classlib.java.util;
 /**
  *
  * @author Alexey Andreev
+ * @param <E>
  */
 public interface TEnumeration<E> {
     boolean hasMoreElements();
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/THashSet.java b/teavm-classlib/src/main/java/org/teavm/classlib/java/util/THashSet.java
index eff1c5a1e..133505bcb 100644
--- a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/THashSet.java
+++ b/teavm-classlib/src/main/java/org/teavm/classlib/java/util/THashSet.java
@@ -25,6 +25,7 @@ import org.teavm.javascript.spi.Rename;
 /**
  *
  * @author Alexey Andreev
+ * @param <E>
  */
 public class THashSet<E> extends TAbstractSet<E> implements TCloneable, TSerializable {
     transient THashMap<E, THashSet<E>> backingMap;
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TIterator.java b/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TIterator.java
index d06f53c14..bb50abc3b 100644
--- a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TIterator.java
+++ b/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TIterator.java
@@ -18,6 +18,7 @@ package org.teavm.classlib.java.util;
 /**
  *
  * @author Alexey Andreev
+ * @param <E>
  */
 public interface TIterator<E> {
     boolean hasNext();
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TLinkedList.java b/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TLinkedList.java
index 7c7a80518..cdf096d66 100644
--- a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TLinkedList.java
+++ b/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TLinkedList.java
@@ -19,6 +19,7 @@ package org.teavm.classlib.java.util;
 /**
  *
  * @author Alexey Andreev
+ * @param <E>
  */
 public class TLinkedList<E> extends TAbstractSequentialList<E> implements TDeque<E> {
     static class Entry<E> {
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TList.java b/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TList.java
index ca915c89e..0c6ac7c51 100644
--- a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TList.java
+++ b/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TList.java
@@ -18,6 +18,7 @@ package org.teavm.classlib.java.util;
 /**
  *
  * @author Alexey Andreev
+ * @param <E>
  */
 public interface TList<E> extends TCollection<E> {
     boolean addAll(int index, TCollection<? extends E> c);
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TListIterator.java b/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TListIterator.java
index 0ae00d745..9f99a3427 100644
--- a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TListIterator.java
+++ b/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TListIterator.java
@@ -18,6 +18,7 @@ package org.teavm.classlib.java.util;
 /**
  *
  * @author Alexey Andreev
+ * @param <E>
  */
 public interface TListIterator<E> extends TIterator<E> {
     boolean hasPrevious();
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TMap.java b/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TMap.java
index c1c08f945..a11e31be9 100644
--- a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TMap.java
+++ b/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TMap.java
@@ -18,6 +18,8 @@ package org.teavm.classlib.java.util;
 /**
  *
  * @author Alexey Andreev
+ * @param <K>
+ * @param <V>
  */
 public interface TMap<K, V> {
     public static interface Entry<K1, V1> {
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TNavigableMap.java b/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TNavigableMap.java
index 49dc61f46..99fa032bc 100644
--- a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TNavigableMap.java
+++ b/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TNavigableMap.java
@@ -18,6 +18,8 @@ package org.teavm.classlib.java.util;
 /**
  *
  * @author Alexey Andreev
+ * @param <K>
+ * @param <V>
  */
 public interface TNavigableMap<K, V> extends TSortedMap<K, V> {
     Entry<K, V> lowerEntry(K key);
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TNavigableSet.java b/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TNavigableSet.java
index fb03512da..0e2715d64 100644
--- a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TNavigableSet.java
+++ b/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TNavigableSet.java
@@ -18,6 +18,7 @@ package org.teavm.classlib.java.util;
 /**
  *
  * @author Alexey Andreev
+ * @param <E>
  */
 public interface TNavigableSet<E> extends TSortedSet<E> {
     E lower(E e);
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TPriorityQueue.java b/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TPriorityQueue.java
index 93aa64476..2ae5f83e8 100644
--- a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TPriorityQueue.java
+++ b/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TPriorityQueue.java
@@ -25,6 +25,7 @@ import org.teavm.classlib.java.lang.TNullPointerException;
 /**
  *
  * @author Alexey Andreev
+ * @param <E>
  */
 public class TPriorityQueue<E> extends TAbstractQueue<E> implements TSerializable {
     private Object[] data;
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TQueue.java b/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TQueue.java
index 594183787..27b2805cf 100644
--- a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TQueue.java
+++ b/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TQueue.java
@@ -18,6 +18,7 @@ package org.teavm.classlib.java.util;
 /**
  *
  * @author Alexey Andreev
+ * @param <E>
  */
 public interface TQueue<E> extends TCollection<E> {
     boolean offer(E e);
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TServiceLoader.java b/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TServiceLoader.java
index e4df072af..0e628b5b9 100644
--- a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TServiceLoader.java
+++ b/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TServiceLoader.java
@@ -21,6 +21,7 @@ import org.teavm.platform.PlatformClass;
 /**
  *
  * @author Alexey Andreev
+ * @param <S>
  */
 public final class TServiceLoader<S> extends TObject implements TIterable<S> {
     private Object[] services;
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TSet.java b/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TSet.java
index 396d4b0d9..e29017c95 100644
--- a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TSet.java
+++ b/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TSet.java
@@ -18,6 +18,7 @@ package org.teavm.classlib.java.util;
 /**
  *
  * @author Alexey Andreev
+ * @param <E>
  */
 public interface TSet<E> extends TCollection<E> {
 }
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TSetFromMap.java b/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TSetFromMap.java
index cf397b90c..f2b943ca8 100644
--- a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TSetFromMap.java
+++ b/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TSetFromMap.java
@@ -20,6 +20,7 @@ import org.teavm.classlib.java.lang.TBoolean;
 /**
  *
  * @author Alexey Andreev
+ * @param <E>
  */
 public class TSetFromMap<E> extends TAbstractSet<E> {
     private TMap<E, TBoolean> map;
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TSortedMap.java b/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TSortedMap.java
index 864e32245..4815accc3 100644
--- a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TSortedMap.java
+++ b/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TSortedMap.java
@@ -18,6 +18,8 @@ package org.teavm.classlib.java.util;
 /**
  *
  * @author Alexey Andreev
+ * @param <K>
+ * @param <V>
  */
 public interface TSortedMap<K, V> extends TMap<K, V> {
     TComparator<? super K> comparator();
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TSortedSet.java b/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TSortedSet.java
index 3a58e5c90..d9d92be93 100644
--- a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TSortedSet.java
+++ b/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TSortedSet.java
@@ -18,6 +18,7 @@ package org.teavm.classlib.java.util;
 /**
  *
  * @author Alexey Andreev
+ * @param <E>
  */
 public interface TSortedSet<E> extends TSet<E> {
     TComparator<? super E> comparator();
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TTreeSet.java b/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TTreeSet.java
index 5d8ef7815..034551234 100644
--- a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TTreeSet.java
+++ b/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TTreeSet.java
@@ -3,6 +3,7 @@ package org.teavm.classlib.java.util;
 /**
  *
  * @author Alexey Andreev
+ * @param <E>
  */
 public class TTreeSet<E> extends TAbstractSet<E> implements TNavigableSet<E> {
     private static final Object VALUE = new Object();
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/concurrent/TCallable.java b/teavm-classlib/src/main/java/org/teavm/classlib/java/util/concurrent/TCallable.java
index bbbea5f72..17b36d7ef 100644
--- a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/concurrent/TCallable.java
+++ b/teavm-classlib/src/main/java/org/teavm/classlib/java/util/concurrent/TCallable.java
@@ -21,6 +21,7 @@ import org.teavm.classlib.java.lang.TObject;
 /**
  *
  * @author Alexey Andreev
+ * @param <V>
  */
 public interface TCallable<V extends TObject> {
     V call() throws TException;
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TAbstractCharClass.java b/teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TAbstractCharClass.java
index 952712f74..af4987cc1 100644
--- a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TAbstractCharClass.java
+++ b/teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TAbstractCharClass.java
@@ -68,12 +68,6 @@ abstract class TAbstractCharClass extends TSpecialToken {
      */
     protected boolean mayContainSupplCodepoints = false;
 
-    /**
-     * Returns true if this char class contains character specified;
-     *
-     * @param ch
-     *            character to check;
-     */
     abstract public boolean contains(int ch);
 
     /**
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TAbstractSet.java b/teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TAbstractSet.java
index 7f3c3c934..d985b2a11 100644
--- a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TAbstractSet.java
+++ b/teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TAbstractSet.java
@@ -143,14 +143,6 @@ abstract class TAbstractSet {
         return -1;
     }
 
-    /**
-     * Returns true, if this node has consumed any characters during positive
-     * match attempt, for example node representing character always consumes
-     * one character if it matches. If particular node matches empty sting this
-     * method will return false;
-     *
-     * @param matchResult
-     */
     public abstract boolean hasConsumed(TMatchResultImpl matchResult);
 
     /**
@@ -175,9 +167,6 @@ abstract class TAbstractSet {
         return getQualifiedName();
     }
 
-    /**
-     * Returns the next.
-     */
     public TAbstractSet getNext() {
         return next;
     }
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TCompositeGroupQuantifierSet.java b/teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TCompositeGroupQuantifierSet.java
index 09cbfca29..451c01aac 100644
--- a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TCompositeGroupQuantifierSet.java
+++ b/teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TCompositeGroupQuantifierSet.java
@@ -46,16 +46,6 @@ class TCompositeGroupQuantifierSet extends TGroupQuantifierSet {
 
     int setCounter;
 
-    /**
-     * Constructs CompositeGroupQuantifierSet
-     *
-     * @param quant
-     *            - given composite quantifier
-     * @param innerSet
-     *            - given group
-     * @param next
-     *            - next set after the quantifier
-     */
     public TCompositeGroupQuantifierSet(TQuantifier quant, TAbstractSet innerSet, TAbstractSet next, int type,
             int setCounter) {
         super(innerSet, next, type);
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TLeafSet.java b/teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TLeafSet.java
index 9d349dbd0..e7c914ce6 100644
--- a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TLeafSet.java
+++ b/teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TLeafSet.java
@@ -38,10 +38,6 @@ abstract class TLeafSet extends TAbstractSet {
     public TLeafSet() {
     }
 
-    /**
-     * Returns "shift", the number of accepted chars commonly internal function,
-     * but called by quantifiers.
-     */
     public abstract int accepts(int stringIndex, CharSequence testString);
 
     /**
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TLexer.java b/teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TLexer.java
index 4b344dae8..5b1752ed8 100644
--- a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TLexer.java
+++ b/teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TLexer.java
@@ -281,34 +281,21 @@ class TLexer {
         return lookAheadST != null;
     }
 
-    /**
-     * Returns current character and moves string index to the next one;
-     *
-     */
     public int next() {
         movePointer();
         return lookBack;
     }
 
-    /**
-     * Returns current special token and moves string index to the next one;
-     */
     public TSpecialToken nextSpecial() {
         TSpecialToken res = curST;
         movePointer();
         return res;
     }
 
-    /**
-     * Returns nest symbol read.
-     */
     public int lookAhead() {
         return lookAhead;
     }
 
-    /**
-     * Returns previous character.
-     */
     public int back() {
         return lookBack;
     }
@@ -780,9 +767,6 @@ class TLexer {
         return ch == 0 && lookAhead == 0 && index == patternFullLength && !isSpecial();
     }
 
-    /**
-     * Returns true if current character is plain token.
-     */
     public static boolean isLetter(int ch) {
 
         // all supplementary codepoints have integer value that is >= 0;
@@ -1061,9 +1045,6 @@ class TLexer {
         return high;
     }
 
-    /**
-     * Returns the curr. character index.
-     */
     public int getIndex() {
         return curToc;
     }
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TQuantifierSet.java b/teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TQuantifierSet.java
index 52d38ee98..a18289ed2 100644
--- a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TQuantifierSet.java
+++ b/teavm-classlib/src/main/java/org/teavm/classlib/java/util/regex/TQuantifierSet.java
@@ -35,9 +35,6 @@ abstract class TQuantifierSet extends TAbstractSet {
         setType(type);
     }
 
-    /**
-     * Returns the innerSet.
-     */
     public TAbstractSet getInnerSet() {
         return innerSet;
     }
diff --git a/teavm-core/src/main/java/org/teavm/callgraph/CallGraphNode.java b/teavm-core/src/main/java/org/teavm/callgraph/CallGraphNode.java
index b027e3bed..445df4552 100644
--- a/teavm-core/src/main/java/org/teavm/callgraph/CallGraphNode.java
+++ b/teavm-core/src/main/java/org/teavm/callgraph/CallGraphNode.java
@@ -23,23 +23,31 @@ import org.teavm.model.MethodReference;
  * @author Alexey Andreev
  */
 public interface CallGraphNode {
-    /*
+    /**
      * Returns reference to entire call graph.
+     *
+     * @return graph
      */
     CallGraph getGraph();
 
     /**
      * Returns the method that this node represents.
+     *
+     * @return method
      */
     MethodReference getMethod();
 
     /**
      * Returns immutable collection of all call sites that are in the method.
+     *
+     * @return call site
      */
     Collection<? extends CallSite> getCallSites();
 
     /**
      * Returns immutable collection of all call sites that call this method.
+     *
+     * @return call sites
      */
     Collection<? extends CallSite> getCallerCallSites();
 
diff --git a/teavm-core/src/main/java/org/teavm/callgraph/CallSite.java b/teavm-core/src/main/java/org/teavm/callgraph/CallSite.java
index 3aa170b13..b5282ca4b 100644
--- a/teavm-core/src/main/java/org/teavm/callgraph/CallSite.java
+++ b/teavm-core/src/main/java/org/teavm/callgraph/CallSite.java
@@ -31,11 +31,15 @@ public interface CallSite {
 
     /**
      * <p>Gets a method that this call site invokes.</p>
+     *
+     * @return a node that represent methods being called
      */
     CallGraphNode getCallee();
 
     /**
      * <p>Gets a method that contains this call site.</p>
+     *
+     * @return a node that represents methods's caller
      */
     CallGraphNode getCaller();
 }
diff --git a/teavm-core/src/main/java/org/teavm/common/CachedMapper.java b/teavm-core/src/main/java/org/teavm/common/CachedMapper.java
index 2fdee5642..c54df64d9 100644
--- a/teavm-core/src/main/java/org/teavm/common/CachedMapper.java
+++ b/teavm-core/src/main/java/org/teavm/common/CachedMapper.java
@@ -20,6 +20,9 @@ import java.util.*;
 /**
  *
  * @author Alexey Andreev
+ *
+ * @param <T> which type this mapper takes.
+ * @param <R> which type this mapper produces.
  */
 public class CachedMapper<T, R> implements Mapper<T, R> {
     private Mapper<T, R> innerMapper;
diff --git a/teavm-core/src/main/java/org/teavm/common/Mapper.java b/teavm-core/src/main/java/org/teavm/common/Mapper.java
index af16bcbe5..e4d54c1af 100644
--- a/teavm-core/src/main/java/org/teavm/common/Mapper.java
+++ b/teavm-core/src/main/java/org/teavm/common/Mapper.java
@@ -18,6 +18,8 @@ package org.teavm.common;
 /**
  *
  * @author Alexey Andreev
+ * @param <T> which type this mapper takes.
+ * @param <R> which type this mapper produces.
  */
 public interface Mapper<T, R> {
     R map(T preimage);
diff --git a/teavm-core/src/main/java/org/teavm/vm/TeaVM.java b/teavm-core/src/main/java/org/teavm/vm/TeaVM.java
index edc1e69b7..f06967cd5 100644
--- a/teavm-core/src/main/java/org/teavm/vm/TeaVM.java
+++ b/teavm-core/src/main/java/org/teavm/vm/TeaVM.java
@@ -140,6 +140,7 @@ public class TeaVM implements TeaVMHost, ServiceRepository {
      * Reports whether this TeaVM instance uses obfuscation when generating the JavaScript code.
      *
      * @see #setMinifying(boolean)
+     * @return whether TeaVM produces obfuscated code.
      */
     public boolean isMinifying() {
         return minifying;
@@ -149,6 +150,7 @@ public class TeaVM implements TeaVMHost, ServiceRepository {
      * Specifies whether this TeaVM instance uses obfuscation when generating the JavaScript code.
      *
      * @see #isMinifying()
+     * @param minifying whether TeaVM should obfuscate code.
      */
     public void setMinifying(boolean minifying) {
         this.minifying = minifying;
@@ -287,6 +289,8 @@ public class TeaVM implements TeaVMHost, ServiceRepository {
     /**
      * Gets a {@link ClassReaderSource} which is used by this TeaVM instance. It is exactly what was
      * passed to {@link TeaVMBuilder#setClassSource(ClassHolderSource)}.
+     *
+     * @return class source.
      */
     public ClassReaderSource getClassSource() {
         return classSource;
@@ -322,6 +326,8 @@ public class TeaVM implements TeaVMHost, ServiceRepository {
      * @param writer where to generate JavaScript. Should not be null.
      * @param target where to generate additional resources. Can be null, but if there are
      * plugins or inteceptors that generate additional resources, the build process will fail.
+     *
+     * @throws RenderingException when something went wrong during rendering phase.
      */
     public void build(Appendable writer, BuildTarget target) throws RenderingException {
         // Check dependencies
diff --git a/teavm-core/src/main/java/org/teavm/vm/spi/TeaVMHost.java b/teavm-core/src/main/java/org/teavm/vm/spi/TeaVMHost.java
index 10a8e6c15..d76709353 100644
--- a/teavm-core/src/main/java/org/teavm/vm/spi/TeaVMHost.java
+++ b/teavm-core/src/main/java/org/teavm/vm/spi/TeaVMHost.java
@@ -46,6 +46,7 @@ public interface TeaVMHost {
     /**
      * Gets class loaded that is used by TeaVM. This class loader is usually specified by
      * {@link TeaVMBuilder#setClassLoader(ClassLoader)}
+     * @return class loader that can be used by plugins.
      */
     ClassLoader getClassLoader();
 
diff --git a/teavm-dom/src/main/java/org/teavm/dom/core/NamedNodeMap.java b/teavm-dom/src/main/java/org/teavm/dom/core/NamedNodeMap.java
index 394127fa9..56318ec32 100644
--- a/teavm-dom/src/main/java/org/teavm/dom/core/NamedNodeMap.java
+++ b/teavm-dom/src/main/java/org/teavm/dom/core/NamedNodeMap.java
@@ -22,6 +22,7 @@ import org.teavm.jso.JSProperty;
 /**
  *
  * @author Alexey Andreev
+ * @param <T> type of nodes in this map.
  */
 public interface NamedNodeMap<T extends Node> extends JSObject, JSArrayReader<T> {
     T getNamedItem(String name);
diff --git a/teavm-dom/src/main/java/org/teavm/dom/core/NodeList.java b/teavm-dom/src/main/java/org/teavm/dom/core/NodeList.java
index f3a9fff6b..0b5f9cb51 100644
--- a/teavm-dom/src/main/java/org/teavm/dom/core/NodeList.java
+++ b/teavm-dom/src/main/java/org/teavm/dom/core/NodeList.java
@@ -21,6 +21,7 @@ import org.teavm.jso.JSProperty;
 /**
  *
  * @author Alexey Andreev
+ * @param <T> type of nodes in this list.
  */
 public interface NodeList<T extends Node> extends JSArrayReader<T> {
     T item(int index);
diff --git a/teavm-jso/src/main/java/org/teavm/jso/JSArray.java b/teavm-jso/src/main/java/org/teavm/jso/JSArray.java
index 402582300..ff080c26a 100644
--- a/teavm-jso/src/main/java/org/teavm/jso/JSArray.java
+++ b/teavm-jso/src/main/java/org/teavm/jso/JSArray.java
@@ -18,6 +18,7 @@ package org.teavm.jso;
 /**
  *
  * @author Alexey Andreev
+ * @param <T>
  */
 public interface JSArray<T extends JSObject> extends JSArrayReader<T> {
     @JSIndexer
diff --git a/teavm-jso/src/main/java/org/teavm/jso/JSArrayReader.java b/teavm-jso/src/main/java/org/teavm/jso/JSArrayReader.java
index 4b635b914..536d40452 100644
--- a/teavm-jso/src/main/java/org/teavm/jso/JSArrayReader.java
+++ b/teavm-jso/src/main/java/org/teavm/jso/JSArrayReader.java
@@ -18,6 +18,7 @@ package org.teavm.jso;
 /**
  *
  * @author Alexey Andreev
+ * @param <T>
  */
 public interface JSArrayReader<T extends JSObject> extends JSObject {
     @JSProperty
diff --git a/teavm-jso/src/main/java/org/teavm/jso/JSSortFunction.java b/teavm-jso/src/main/java/org/teavm/jso/JSSortFunction.java
index a5ef40fa3..69bcec557 100644
--- a/teavm-jso/src/main/java/org/teavm/jso/JSSortFunction.java
+++ b/teavm-jso/src/main/java/org/teavm/jso/JSSortFunction.java
@@ -18,6 +18,7 @@ package org.teavm.jso;
 /**
  *
  * @author Alexey Andreev
+ * @param <T>
  */
 @JSFunctor
 public interface JSSortFunction<T extends JSObject> {
diff --git a/teavm-platform/src/main/java/org/teavm/platform/PlatformQueue.java b/teavm-platform/src/main/java/org/teavm/platform/PlatformQueue.java
index e2c0c691c..6d9e8ca96 100644
--- a/teavm-platform/src/main/java/org/teavm/platform/PlatformQueue.java
+++ b/teavm-platform/src/main/java/org/teavm/platform/PlatformQueue.java
@@ -24,6 +24,7 @@ import org.teavm.platform.plugin.PlatformQueueGenerator;
 /**
  *
  * @author Alexey Andreev
+ * @param <T>
  */
 public abstract class PlatformQueue<T> implements JSObject {
     @JSProperty
diff --git a/teavm-platform/src/main/java/org/teavm/platform/PlatformSequence.java b/teavm-platform/src/main/java/org/teavm/platform/PlatformSequence.java
index 269a8ac97..e7faeac85 100644
--- a/teavm-platform/src/main/java/org/teavm/platform/PlatformSequence.java
+++ b/teavm-platform/src/main/java/org/teavm/platform/PlatformSequence.java
@@ -22,6 +22,7 @@ import org.teavm.jso.JSProperty;
 /**
  *
  * @author Alexey Andreev
+ * @param <T>
  */
 public interface PlatformSequence<T extends JSObject> extends JSObject {
     @JSProperty
diff --git a/teavm-platform/src/main/java/org/teavm/platform/async/AsyncCallback.java b/teavm-platform/src/main/java/org/teavm/platform/async/AsyncCallback.java
index 21c200b44..4f6a63eac 100644
--- a/teavm-platform/src/main/java/org/teavm/platform/async/AsyncCallback.java
+++ b/teavm-platform/src/main/java/org/teavm/platform/async/AsyncCallback.java
@@ -18,6 +18,7 @@ package org.teavm.platform.async;
 /**
  *
  * @author Alexey Andreev
+ * @param <T>
  */
 public interface AsyncCallback<T> {
     void complete(T result);
diff --git a/teavm-platform/src/main/java/org/teavm/platform/metadata/MetadataGenerator.java b/teavm-platform/src/main/java/org/teavm/platform/metadata/MetadataGenerator.java
index f52066545..e66b2d689 100644
--- a/teavm-platform/src/main/java/org/teavm/platform/metadata/MetadataGenerator.java
+++ b/teavm-platform/src/main/java/org/teavm/platform/metadata/MetadataGenerator.java
@@ -60,6 +60,7 @@ public interface MetadataGenerator {
      *
      * @param context context that contains useful compile-time information.
      * @param method method which will be used to access the generated resources at run time.
+     * @return resource to be attached to method at run time.
      */
     Resource generateMetadata(MetadataGeneratorContext context, MethodReference method);
 }
diff --git a/teavm-platform/src/main/java/org/teavm/platform/metadata/MetadataGeneratorContext.java b/teavm-platform/src/main/java/org/teavm/platform/metadata/MetadataGeneratorContext.java
index ebb7c56d8..fa3b1aa52 100644
--- a/teavm-platform/src/main/java/org/teavm/platform/metadata/MetadataGeneratorContext.java
+++ b/teavm-platform/src/main/java/org/teavm/platform/metadata/MetadataGeneratorContext.java
@@ -31,44 +31,62 @@ import org.teavm.vm.TeaVM;
 public interface MetadataGeneratorContext extends ServiceRepository {
     /**
      * Gets the collection of all classes that were achieved by the dependency checker.
+     *
+     * @return class source.
      */
     ListableClassReaderSource getClassSource();
 
     /**
      * Gets the class loader that is used by the compiler.
+     * @return class loader.
      */
     ClassLoader getClassLoader();
 
     /**
      * Gets properties that were specified to {@link TeaVM}.
+     *
+     * @return properties.
      */
     Properties getProperties();
 
     /**
      * Creates a new resource of the given type. The description of valid resources
      * is available in documentation for {@link Resource}.
+     *
+     * @param resourceType type of resource to create.
+     * @return a new resource
      */
     <T extends Resource> T createResource(Class<T> resourceType);
 
     /**
      * Creates a new resource that represents class literal. Client code then may use
      * {@link Platform#classFromResource(ClassResource)} to get actual class.
+     *
+     * @param className class to which resource is to point.
+     * @return a new resource.
      */
     ClassResource createClassResource(String className);
 
     /**
      * Creates a new resource that represents static field. Client code then may use
      * {@link Platform#objectFromResource(StaticFieldResource)} to get actual field value.
+     *
+     * @param field field for which to create resource.
+     * @return a new resource.
      */
     StaticFieldResource createFieldResource(FieldReference field);
 
     /**
      * Creates a new resource array.
+     *
+     * @return a new resource.
      */
     <T extends Resource> ResourceArray<T> createResourceArray();
 
     /**
      * Creates a new resource map.
+     *
+     * @return a new resource.
      */
     <T extends Resource> ResourceMap<T> createResourceMap();
 }
diff --git a/teavm-platform/src/main/java/org/teavm/platform/metadata/ResourceArray.java b/teavm-platform/src/main/java/org/teavm/platform/metadata/ResourceArray.java
index 39ba81d1e..8a0f1b23b 100644
--- a/teavm-platform/src/main/java/org/teavm/platform/metadata/ResourceArray.java
+++ b/teavm-platform/src/main/java/org/teavm/platform/metadata/ResourceArray.java
@@ -18,6 +18,7 @@ package org.teavm.platform.metadata;
 /**
  *
  * @author Alexey Andreev
+ * @param <T>
  */
 public interface ResourceArray<T extends Resource> extends Resource {
     int size();
diff --git a/teavm-platform/src/main/java/org/teavm/platform/metadata/ResourceMap.java b/teavm-platform/src/main/java/org/teavm/platform/metadata/ResourceMap.java
index 888508538..ddb334de1 100644
--- a/teavm-platform/src/main/java/org/teavm/platform/metadata/ResourceMap.java
+++ b/teavm-platform/src/main/java/org/teavm/platform/metadata/ResourceMap.java
@@ -18,6 +18,7 @@ package org.teavm.platform.metadata;
 /**
  *
  * @author Alexey Andreev
+ * @param <T>
  */
 public interface ResourceMap<T extends Resource> extends Resource {
     boolean has(String key);
diff --git a/teavm-tests/src/test/java/org/teavm/classlib/java/util/TreeMapTest.java b/teavm-tests/src/test/java/org/teavm/classlib/java/util/TreeMapTest.java
index 0e6d30bea..995a2af6b 100644
--- a/teavm-tests/src/test/java/org/teavm/classlib/java/util/TreeMapTest.java
+++ b/teavm-tests/src/test/java/org/teavm/classlib/java/util/TreeMapTest.java
@@ -535,7 +535,7 @@ public class TreeMapTest {
                 !myTreeMap.containsValue(new Integer(0)));
     }
 
-    /**
+    /*
      * Tests entrySet().contains() method behaviour with respect to entries
      * with null values.
      * Regression test for HARMONY-5788.