diff --git a/src/main/java/ch/dissem/bitmessage/server/CleanupJob.java b/src/main/java/ch/dissem/bitmessage/server/CleanupJob.java
index 8b93cea..2294d42 100644
--- a/src/main/java/ch/dissem/bitmessage/server/CleanupJob.java
+++ b/src/main/java/ch/dissem/bitmessage/server/CleanupJob.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2015 Christian Basler
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package ch.dissem.bitmessage.server;
 
 import ch.dissem.bitmessage.BitmessageContext;
@@ -7,7 +23,7 @@ import org.slf4j.LoggerFactory;
 import java.util.TimerTask;
 
 /**
- * Created by chrigu on 04.10.15.
+ * @author Christian Basler
  */
 public class CleanupJob extends TimerTask {
     private static final Logger LOG = LoggerFactory.getLogger(CleanupJob.class);
diff --git a/src/main/java/ch/dissem/bitmessage/server/Converter.java b/src/main/java/ch/dissem/bitmessage/server/Converter.java
index 0e387c4..364831a 100644
--- a/src/main/java/ch/dissem/bitmessage/server/Converter.java
+++ b/src/main/java/ch/dissem/bitmessage/server/Converter.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2015 Christian Basler
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package ch.dissem.bitmessage.server;
 
 import ch.dissem.bitmessage.entity.BitmessageAddress;
diff --git a/src/main/java/ch/dissem/bitmessage/server/JabitServerConfig.java b/src/main/java/ch/dissem/bitmessage/server/JabitServerConfig.java
index 82ee924..d0959f2 100644
--- a/src/main/java/ch/dissem/bitmessage/server/JabitServerConfig.java
+++ b/src/main/java/ch/dissem/bitmessage/server/JabitServerConfig.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2015 Christian Basler
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package ch.dissem.bitmessage.server;
 
 import ch.dissem.bitmessage.BitmessageContext;
diff --git a/src/main/java/ch/dissem/bitmessage/server/JabitServerController.java b/src/main/java/ch/dissem/bitmessage/server/JabitServerController.java
index 9b458a9..6607955 100644
--- a/src/main/java/ch/dissem/bitmessage/server/JabitServerController.java
+++ b/src/main/java/ch/dissem/bitmessage/server/JabitServerController.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2015 Christian Basler
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package ch.dissem.bitmessage.server;
 
 import ch.dissem.bitmessage.BitmessageContext;
diff --git a/src/main/java/ch/dissem/bitmessage/server/ServerObjectListener.java b/src/main/java/ch/dissem/bitmessage/server/ServerObjectListener.java
index 83a0c99..656a8f5 100644
--- a/src/main/java/ch/dissem/bitmessage/server/ServerObjectListener.java
+++ b/src/main/java/ch/dissem/bitmessage/server/ServerObjectListener.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2015 Christian Basler
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package ch.dissem.bitmessage.server;
 
 import ch.dissem.bitmessage.DefaultObjectListener;
@@ -90,6 +106,7 @@ public class ServerObjectListener extends DefaultObjectListener {
     }
 
     private void calculateNonceForClient(ObjectMessage object, Broadcast broadcast) throws IOException {
+        // TODO: prevent doing calculation twice
         for (BitmessageAddress client : clients) {
             try {
                 broadcast.decrypt(client);
diff --git a/src/main/java/ch/dissem/bitmessage/server/Utils.java b/src/main/java/ch/dissem/bitmessage/server/Utils.java
index d9bcc49..50d6a5f 100644
--- a/src/main/java/ch/dissem/bitmessage/server/Utils.java
+++ b/src/main/java/ch/dissem/bitmessage/server/Utils.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2015 Christian Basler
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package ch.dissem.bitmessage.server;
 
 import java.io.File;