diff --git a/src/com/google/bitcoin/core/PeerEventListener.java b/src/com/google/bitcoin/core/PeerEventListener.java
index 9fccf19f..9921916c 100644
--- a/src/com/google/bitcoin/core/PeerEventListener.java
+++ b/src/com/google/bitcoin/core/PeerEventListener.java
@@ -16,14 +16,9 @@
 
 package com.google.bitcoin.core;
 
-import java.math.BigInteger;
-
-// TODO: Make this be an interface with a convenience abstract impl.
-
 /**
- * Implementing a subclass WalletEventListener allows you to learn when the contents of the wallet changes due to
- * receiving money or a block chain re-organize. Methods are called with the event listener object locked so your
- * implementation does not have to be thread safe. The default method implementations do nothing.
+ * Implementing a PeerEventListener allows you to learn when significant Peer communication
+ * has occurred. 
  */
 public interface PeerEventListener {
     /**
diff --git a/src/com/google/bitcoin/core/PeerGroup.java b/src/com/google/bitcoin/core/PeerGroup.java
index ecb171a2..cc17b354 100644
--- a/src/com/google/bitcoin/core/PeerGroup.java
+++ b/src/com/google/bitcoin/core/PeerGroup.java
@@ -1,4 +1,19 @@
-// Copyright 2011 Google Inc. All Rights Reserved.
+/**
+ * Copyright 2011 Google Inc.
+ *
+ * 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 com.google.bitcoin.core;
 
diff --git a/src/com/google/bitcoin/examples/DownloadListener.java b/src/com/google/bitcoin/examples/DownloadListener.java
index 8fd85191..2f631a9e 100644
--- a/src/com/google/bitcoin/examples/DownloadListener.java
+++ b/src/com/google/bitcoin/examples/DownloadListener.java
@@ -1,4 +1,18 @@
-// Copyright 2011 Google Inc. All Rights Reserved.
+/**
+ * Copyright 2011 Google Inc.
+ *
+ * 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 com.google.bitcoin.examples;