diff --git a/java/src/ipaaca/IUPublishedException.java b/java/src/ipaaca/IUPublishedException.java
index 0431e1dae1f830f5a9f9f68d2d40cc405e43e532..d94d5ddbda97d7b46557dfd70abec234dcfae1bf 100644
--- a/java/src/ipaaca/IUPublishedException.java
+++ b/java/src/ipaaca/IUPublishedException.java
@@ -1,17 +1,24 @@
 package ipaaca;
 
-public class IUPublishedException extends RuntimeException{
-	private static final long serialVersionUID = 1L;
-	private final AbstractIU iu;
-	
-	public AbstractIU getIU() {
-		return iu;
-	}
-	
-	public IUPublishedException(AbstractIU iu)
-	{
-		super("IU " + iu.getUid() + " is already present in the output buffer.");
-		this.iu = iu;
-	}
+/**
+ * IUPublishedException exceptions occur when publishing (=putting it in an output buffer) an already published IU.
+ * @author hvanwelbergen
+ *
+ */
+public class IUPublishedException extends RuntimeException
+{
+    private static final long serialVersionUID = 1L;
+    private final AbstractIU iu;
+
+    public AbstractIU getIU()
+    {
+        return iu;
+    }
+
+    public IUPublishedException(AbstractIU iu)
+    {
+        super("IU " + iu.getUid() + " is already present in the output buffer.");
+        this.iu = iu;
+    }
 
 }
diff --git a/java/src/ipaaca/IUReadOnlyException.java b/java/src/ipaaca/IUReadOnlyException.java
index 59bf6a293cba54b3718a81a9926ebe4e7f95ee5a..cc7b935420cf5549868873ea01fbda5a4e4d1619 100644
--- a/java/src/ipaaca/IUReadOnlyException.java
+++ b/java/src/ipaaca/IUReadOnlyException.java
@@ -1,16 +1,23 @@
 package ipaaca;
 
-public class IUReadOnlyException extends RuntimeException{
-	private static final long serialVersionUID = 1L;
-	private final AbstractIU iu;
-	
-	public AbstractIU getIU() {
-		return iu;
-	}
-	
-	public IUReadOnlyException(AbstractIU iu)
-	{
-		super("Writing to IU " + iu.getUid() + " failed -- it is read-only.");
-		this.iu = iu;
-	}
+/**
+ * IUReadOnlyException's occur when writing to a read-only IU
+ * @author hvanwelbergen
+ *
+ */
+public class IUReadOnlyException extends RuntimeException
+{
+    private static final long serialVersionUID = 1L;
+    private final AbstractIU iu;
+
+    public AbstractIU getIU()
+    {
+        return iu;
+    }
+
+    public IUReadOnlyException(AbstractIU iu)
+    {
+        super("Writing to IU " + iu.getUid() + " failed -- it is read-only.");
+        this.iu = iu;
+    }
 }
diff --git a/java/src/ipaaca/IUStore.java b/java/src/ipaaca/IUStore.java
index 96b6d65899b8ffbfbb19443dbe5baaf9acf35adf..170b283938379bf71355557fd9ef24b7c9b16014 100644
--- a/java/src/ipaaca/IUStore.java
+++ b/java/src/ipaaca/IUStore.java
@@ -1,7 +1,14 @@
 package ipaaca;
-import java.util.HashMap;
 
+import java.util.HashMap;
 
-public class IUStore<X extends AbstractIU> extends HashMap<String,X>{
+/**
+ * An IUStore maps an IUid to an IU
+ * @author hvanwelbergen
+ *
+ * @param <X> type of AbstractIU stored in the store
+ */
+public class IUStore<X extends AbstractIU> extends HashMap<String, X>
+{
     private static final long serialVersionUID = 1L;
 }
diff --git a/java/src/ipaaca/IUUpdateFailedException.java b/java/src/ipaaca/IUUpdateFailedException.java
index e06c1d9e1f0df44a9a993477e3fdf8af67b294d5..e2b9b178e97e198d5f16c36e025d491f40dfb3c2 100644
--- a/java/src/ipaaca/IUUpdateFailedException.java
+++ b/java/src/ipaaca/IUUpdateFailedException.java
@@ -1,16 +1,23 @@
 package ipaaca;
 
-public class IUUpdateFailedException extends RuntimeException{
-	private static final long serialVersionUID = 1L;
-	private final AbstractIU iu;
-	
-	public AbstractIU getIU() {
-		return iu;
-	}
-	
-	public IUUpdateFailedException(AbstractIU iu)
-	{
-		super("Remote update failed for IU " + iu.getUid() + ".");
-		this.iu = iu;
-	}
+/**
+ * Indicates that a remote update failed
+ * @author hvanwelbergen
+ *
+ */
+public class IUUpdateFailedException extends RuntimeException
+{
+    private static final long serialVersionUID = 1L;
+    private final AbstractIU iu;
+
+    public AbstractIU getIU()
+    {
+        return iu;
+    }
+
+    public IUUpdateFailedException(AbstractIU iu)
+    {
+        super("Remote update failed for IU " + iu.getUid() + ".");
+        this.iu = iu;
+    }
 }
diff --git a/java/src/ipaaca/Initializer.java b/java/src/ipaaca/Initializer.java
index 331bdcc7ed5df44a3e4e85561e605917a1116594..0695993a5b7cef625809aae4a90b6cf8e9c370f2 100644
--- a/java/src/ipaaca/Initializer.java
+++ b/java/src/ipaaca/Initializer.java
@@ -5,35 +5,26 @@ import rsb.converter.ConverterSignature;
 import rsb.converter.DefaultConverterRepository;
 import rsb.converter.ProtocolBufferConverter;
 
-public final class Initializer {
-//	def initialize_ipaaca_rsb():#{{{
-//		rsb.transport.converter.registerGlobalConverter(
-//			IntConverter(wireSchema="int32", dataType=int))
-//		rsb.transport.converter.registerGlobalConverter(
-//			IUConverter(wireSchema="ipaaca-iu", dataType=IU))
-//		rsb.transport.converter.registerGlobalConverter(
-//			IUPayloadUpdateConverter(
-//				wireSchema="ipaaca-iu-payload-update",
-//				dataType=IUPayloadUpdate))
-//		rsb.transport.converter.registerGlobalConverter(
-//			rsb.transport.converter.ProtocolBufferConverter(
-//				messageClass=iuProtoBuf_pb2.IUCommission))
-//		rsb.__defaultParticipantConfig = rsb.ParticipantConfig.fromDefaultSources()
-//	#}}}
-	public static void initializeIpaacaRsb()
-	{
-	    DefaultConverterRepository.getDefaultConverterRepository().addConverter(new IntConverter());
-	    DefaultConverterRepository.getDefaultConverterRepository()
-		  .addConverter(new ProtocolBufferConverter<IUCommission>(IUCommission.getDefaultInstance()));
-	    
-	    DefaultConverterRepository.getDefaultConverterRepository().addConverter(
-	            new IUConverter(new ConverterSignature("ipaaca-iu", RemotePushIU.class)));
-	    DefaultConverterRepository.getDefaultConverterRepository().addConverter(
+/**
+ * Hooks up the ipaaca converters, call initializeIpaacaRsb() before using ipaaca.
+ * @author hvanwelbergen
+ *
+ */
+public final class Initializer
+{
+    private Initializer(){}
+    public static void initializeIpaacaRsb()
+    {
+        DefaultConverterRepository.getDefaultConverterRepository().addConverter(new IntConverter());
+        DefaultConverterRepository.getDefaultConverterRepository().addConverter(
+                new ProtocolBufferConverter<IUCommission>(IUCommission.getDefaultInstance()));
+
+        DefaultConverterRepository.getDefaultConverterRepository().addConverter(
+                new IUConverter(new ConverterSignature("ipaaca-iu", RemotePushIU.class)));
+        DefaultConverterRepository.getDefaultConverterRepository().addConverter(
                 new IUConverter(new ConverterSignature("ipaaca-localiu", LocalIU.class)));
-	    DefaultConverterRepository.getDefaultConverterRepository().addConverter(
-                new PayloadConverter());
-	    DefaultConverterRepository.getDefaultConverterRepository().addConverter(
-                new LinkUpdateConverter());	    
-	    	    
-	}
+        DefaultConverterRepository.getDefaultConverterRepository().addConverter(new PayloadConverter());
+        DefaultConverterRepository.getDefaultConverterRepository().addConverter(new LinkUpdateConverter());
+
+    }
 }
diff --git a/java/src/ipaaca/IntConverter.java b/java/src/ipaaca/IntConverter.java
index 2c7fba3a79b20731f68f7c6761f5aa214d8e19f3..1327b103c9a6aacbbe5a4f4fc85f8a7f60e6b555 100644
--- a/java/src/ipaaca/IntConverter.java
+++ b/java/src/ipaaca/IntConverter.java
@@ -11,6 +11,11 @@ import rsb.converter.WireContents;
 
 import com.google.protobuf.InvalidProtocolBufferException;
 
+/**
+ * Serializer/deserializer for ints
+ * @author hvanwelbergen
+ *
+ */
 public class IntConverter implements Converter<ByteBuffer>
 {
     
diff --git a/java/src/ipaaca/LinkUpdateConverter.java b/java/src/ipaaca/LinkUpdateConverter.java
index db85edb589f192c7bcb0a90d8f9d0e8c71896567..a61e0e417452fc40bc27f97cbe02d1683fd8990d 100644
--- a/java/src/ipaaca/LinkUpdateConverter.java
+++ b/java/src/ipaaca/LinkUpdateConverter.java
@@ -12,6 +12,11 @@ import rsb.converter.WireContents;
 
 import com.google.protobuf.InvalidProtocolBufferException;
 
+/**
+ * Serializer/deserializer for IULinkUpdate
+ * @author hvanwelbergen
+ *
+ */
 public class LinkUpdateConverter implements Converter<ByteBuffer>
 {
     private static final String LINKUPDATE_WIRESCHEMA = "ipaaca-iu-link-update";
diff --git a/java/src/ipaaca/PayloadConverter.java b/java/src/ipaaca/PayloadConverter.java
index a95e7110080722ec36007713ee3ad802713cfb74..c78546ce806ef58cf8335c34185adb49e86a248d 100644
--- a/java/src/ipaaca/PayloadConverter.java
+++ b/java/src/ipaaca/PayloadConverter.java
@@ -12,6 +12,11 @@ import rsb.converter.WireContents;
 
 import com.google.protobuf.InvalidProtocolBufferException;
 
+/**
+ * Serializer/deserializer for IUPayloadUpdate
+ * @author hvanwelbergen
+ *
+ */
 public class PayloadConverter implements Converter<ByteBuffer>
 {
     private static final String PAYLOAD_WIRESCHEMA = "ipaaca-iu-payload-update";
diff --git a/java/src/ipaacademo/PythonCall.java b/java/src/ipaacademo/PythonCall.java
index 09c709343b97b30016d3d310953cd2bd606400fa..6aca5d77a98710ee4a56eab080a06c740b640b95 100644
--- a/java/src/ipaacademo/PythonCall.java
+++ b/java/src/ipaacademo/PythonCall.java
@@ -6,6 +6,11 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 
+/**
+ * Demonstrates how to call a python script from java
+ * @author hvanwelbergen
+ *
+ */
 public class PythonCall
 {
 
diff --git a/java/test/src/ipaaca/InputBufferTest.java b/java/test/src/ipaaca/InputBufferTest.java
index ad12fc61261611ca11f44382f906ca7450e65459..aa63e9833ab05e2a8180253284a91fcf94b914c2 100644
--- a/java/test/src/ipaaca/InputBufferTest.java
+++ b/java/test/src/ipaaca/InputBufferTest.java
@@ -14,6 +14,11 @@ import rsb.RSBException;
 
 import com.google.common.collect.ImmutableSet;
 
+/**
+ * Unit testcases for the input buffer
+ * @author hvanwelbergen
+ *
+ */
 public class InputBufferTest
 {
     private static final String COMPID = "Comp1";
diff --git a/java/test/src/ipaaca/IuConverterTest.java b/java/test/src/ipaaca/IuConverterTest.java
index d1b558ff0bc0191da401c37ea6975dfba98949e4..4d1fac894ee8de350d03bd01d118633e55f7ad63 100644
--- a/java/test/src/ipaaca/IuConverterTest.java
+++ b/java/test/src/ipaaca/IuConverterTest.java
@@ -27,6 +27,11 @@ import rsb.converter.WireContents;
 import rsb.patterns.RemoteServer;
 import static ipaaca.IUTestUtil.*;
 
+/**
+ * Unit test cases for the IUConverter
+ * @author hvanwelbergen
+ *
+ */
 public class IuConverterTest
 {
     private static final String CATEGORY = "category1";
diff --git a/java/test/src/ipaaca/LocalIUTest.java b/java/test/src/ipaaca/LocalIUTest.java
index f131997e69b4359a9b8d2951d9e98a085fac8a56..797859be6bf1b4683eba7f27cc19d57440c3ff8c 100644
--- a/java/test/src/ipaaca/LocalIUTest.java
+++ b/java/test/src/ipaaca/LocalIUTest.java
@@ -6,7 +6,10 @@ import ipaaca.protobuf.Ipaaca.IUPayloadUpdate;
 import org.junit.Before;
 import org.junit.Test;
 import static org.mockito.Mockito.*;
-
+/**
+ * Unit testcases for the LocalIU
+ * @author hvanwelbergen
+ */
 public class LocalIUTest
 {
     OutputBuffer mockBuffer = mock(OutputBuffer.class);