diff --git a/README.md b/README.md
index bec3a86..3fafa30 100644
--- a/README.md
+++ b/README.md
@@ -126,10 +126,6 @@ Message publication:
 
 
 
-
-
-
-
 <h2>Installation</h2>
 The MessageBus is available from the Maven Central Repository using the following coordinates:
 ```
diff --git a/src/dorkbox/messagebus/MessageBus.java b/src/dorkbox/messagebus/MessageBus.java
index 32048d8..69dd6ef 100644
--- a/src/dorkbox/messagebus/MessageBus.java
+++ b/src/dorkbox/messagebus/MessageBus.java
@@ -31,7 +31,7 @@ import dorkbox.messagebus.synchrony.Synchrony;
  * The base class for all message bus implementations with support for asynchronous message dispatch.
  *
  * See this post for insight on how it operates:  http://psy-lob-saw.blogspot.com/2012/12/atomiclazyset-is-performance-win-for.html
- * tldr; we use single-writer-principle + lazySet/get
+ * TLDR: we use single-writer-principle + lazySet/get for major performance
  *
  * @author dorkbox, llc
  *         Date: 2/2/15
diff --git a/src/dorkbox/messagebus/annotations/Listener.java b/src/dorkbox/messagebus/annotations/Listener.java
index 8acdae2..794606d 100644
--- a/src/dorkbox/messagebus/annotations/Listener.java
+++ b/src/dorkbox/messagebus/annotations/Listener.java
@@ -32,6 +32,8 @@ import java.lang.annotation.*;
  * depending on which reference type (@see References) is set
  *
  * @author bennidi
+ * @author dorkbox, llc
+ *         Date: 2/6/16
  */
 @Retention(value = RetentionPolicy.RUNTIME)
 @Target(value = {ElementType.TYPE, ElementType.ANNOTATION_TYPE})
diff --git a/src/dorkbox/messagebus/annotations/References.java b/src/dorkbox/messagebus/annotations/References.java
index 732f492..96e09cb 100644
--- a/src/dorkbox/messagebus/annotations/References.java
+++ b/src/dorkbox/messagebus/annotations/References.java
@@ -25,6 +25,8 @@ package dorkbox.messagebus.annotations;
 /**
  * @author bennidi
  *         Date: 3/29/13
+ * @author dorkbox, llc
+ *         Date: 2/6/16
  */
 public enum References {
     /** This is the default */
diff --git a/src/dorkbox/messagebus/common/ClassTree.java b/src/dorkbox/messagebus/common/ClassTree.java
index 8d7ed33..b0e4b17 100644
--- a/src/dorkbox/messagebus/common/ClassTree.java
+++ b/src/dorkbox/messagebus/common/ClassTree.java
@@ -20,7 +20,6 @@ import com.esotericsoftware.kryo.util.IdentityMap;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicReference;
 
-
 /**
  * Simple tree structure that is a map that contains a chain of keys to publish to a value.
  *
@@ -30,7 +29,6 @@ import java.util.concurrent.atomic.AtomicReference;
  *
  * This data structure is used to keep track of multi-messages - where there is more that one parameter for publish().
  *
- *
  * @author dorkbox, llc
  *         Date: 2/2/15
  */
diff --git a/src/dorkbox/messagebus/dispatch/Dispatch.java b/src/dorkbox/messagebus/dispatch/Dispatch.java
index dc77d4b..9706143 100644
--- a/src/dorkbox/messagebus/dispatch/Dispatch.java
+++ b/src/dorkbox/messagebus/dispatch/Dispatch.java
@@ -15,6 +15,11 @@
  */
 package dorkbox.messagebus.dispatch;
 
+
+/**
+ * @author dorkbox, llc
+ *         Date: 2/2/15
+ */
 public interface Dispatch {
     void publish(Object message1);
     void publish(Object message1, Object message2);
diff --git a/src/dorkbox/messagebus/dispatch/DispatchExact.java b/src/dorkbox/messagebus/dispatch/DispatchExact.java
index caf4252..303c3d5 100644
--- a/src/dorkbox/messagebus/dispatch/DispatchExact.java
+++ b/src/dorkbox/messagebus/dispatch/DispatchExact.java
@@ -24,6 +24,9 @@ import dorkbox.messagebus.subscription.SubscriptionManager;
  * By default, it is the calling thread that has to get the subscriptions, which the sync/async logic then uses.
  *
  * The exception to this rule is when checking/calling DeadMessage publication.
+ *
+ * @author dorkbox, llc
+ *         Date: 2/2/15
  */
 @SuppressWarnings("Duplicates")
 public
diff --git a/src/dorkbox/messagebus/dispatch/DispatchExactWithSuperTypes.java b/src/dorkbox/messagebus/dispatch/DispatchExactWithSuperTypes.java
index 96a05a6..954ecc5 100644
--- a/src/dorkbox/messagebus/dispatch/DispatchExactWithSuperTypes.java
+++ b/src/dorkbox/messagebus/dispatch/DispatchExactWithSuperTypes.java
@@ -20,6 +20,10 @@ import dorkbox.messagebus.error.ErrorHandler;
 import dorkbox.messagebus.subscription.Subscription;
 import dorkbox.messagebus.subscription.SubscriptionManager;
 
+/**
+ * @author dorkbox, llc
+ *         Date: 2/2/15
+ */
 @SuppressWarnings("Duplicates")
 public
 class DispatchExactWithSuperTypes implements Dispatch {
diff --git a/src/dorkbox/messagebus/error/ErrorHandler.java b/src/dorkbox/messagebus/error/ErrorHandler.java
index e74e2a1..4d97886 100644
--- a/src/dorkbox/messagebus/error/ErrorHandler.java
+++ b/src/dorkbox/messagebus/error/ErrorHandler.java
@@ -18,6 +18,9 @@ package dorkbox.messagebus.error;
 import java.util.ArrayDeque;
 import java.util.Collection;
 
+/**
+ * @author bennidi
+ */
 @SuppressWarnings("Duplicates")
 public final
 class ErrorHandler {
diff --git a/src/dorkbox/messagebus/error/PublicationError.java b/src/dorkbox/messagebus/error/PublicationError.java
index aa5432d..550d615 100644
--- a/src/dorkbox/messagebus/error/PublicationError.java
+++ b/src/dorkbox/messagebus/error/PublicationError.java
@@ -47,7 +47,6 @@ import java.util.Arrays;
  *
  * @author bennidi
  *         Date: 2/22/12
- *         Time: 4:59 PM
  * @author dorkbox, llc
  *         Date: 2/2/15
  */
diff --git a/src/dorkbox/messagebus/subscription/Entry.java b/src/dorkbox/messagebus/subscription/Entry.java
index da6b4b2..35bc8fa 100644
--- a/src/dorkbox/messagebus/subscription/Entry.java
+++ b/src/dorkbox/messagebus/subscription/Entry.java
@@ -19,6 +19,11 @@ package dorkbox.messagebus.subscription;
 // not thread-safe!!!
 //
 
+
+/**
+ * @author bennidi
+ * @author dorkbox, llc Date: 2/3/16
+ */
 public
 class Entry<T> {
     private final T value;
diff --git a/src/dorkbox/messagebus/subscription/reflection/ReflectionFactory.java b/src/dorkbox/messagebus/subscription/reflection/ReflectionFactory.java
index 312d1ae..9e7ce7f 100644
--- a/src/dorkbox/messagebus/subscription/reflection/ReflectionFactory.java
+++ b/src/dorkbox/messagebus/subscription/reflection/ReflectionFactory.java
@@ -19,6 +19,10 @@ import dorkbox.messagebus.common.MessageHandler;
 import dorkbox.messagebus.subscription.Subscription;
 import dorkbox.messagebus.subscription.SubscriptionFactory;
 
+/**
+ * @author dorkbox, llc
+ *         Date: 2/3/16
+ */
 public
 class ReflectionFactory implements SubscriptionFactory {
 
diff --git a/src/dorkbox/messagebus/utils/ClassUtils.java b/src/dorkbox/messagebus/utils/ClassUtils.java
index e6454c7..02416eb 100644
--- a/src/dorkbox/messagebus/utils/ClassUtils.java
+++ b/src/dorkbox/messagebus/utils/ClassUtils.java
@@ -23,6 +23,10 @@ import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.concurrent.atomic.AtomicReferenceFieldUpdater;
 
+/**
+ * @author dorkbox
+ *         Date: 4/1/15
+ */
 public final
 class ClassUtils {