diff --git a/tools/cooja/java/se/sics/cooja/CoreComm.java b/tools/cooja/java/se/sics/cooja/CoreComm.java
index 1ea9683d0..06fe29052 100644
--- a/tools/cooja/java/se/sics/cooja/CoreComm.java
+++ b/tools/cooja/java/se/sics/cooja/CoreComm.java
@@ -24,7 +24,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: CoreComm.java,v 1.13 2009/02/20 16:49:43 fros4943 Exp $
+ * $Id: CoreComm.java,v 1.14 2009/03/10 21:05:00 fros4943 Exp $
  */
 
 package se.sics.cooja;
@@ -100,8 +100,7 @@ public abstract class CoreComm {
    */
   public static boolean hasLibraryFileBeenLoaded(File libraryFile) {
     for (File loadedFile : coreCommFiles) {
-      if (loadedFile != null
-          && loadedFile.getName().equals(libraryFile.getName())) {
+      if (loadedFile.getName().equals(libraryFile.getName())) {
         return true;
       }
     }
diff --git a/tools/cooja/java/se/sics/cooja/MoteInterfaceHandler.java b/tools/cooja/java/se/sics/cooja/MoteInterfaceHandler.java
index 80033dcec..5659ea9ca 100644
--- a/tools/cooja/java/se/sics/cooja/MoteInterfaceHandler.java
+++ b/tools/cooja/java/se/sics/cooja/MoteInterfaceHandler.java
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: MoteInterfaceHandler.java,v 1.6 2009/03/09 14:08:03 fros4943 Exp $
+ * $Id: MoteInterfaceHandler.java,v 1.7 2009/03/10 21:05:00 fros4943 Exp $
  */
 
 package se.sics.cooja;
@@ -345,4 +345,7 @@ public class MoteInterfaceHandler {
     polledAfterAll = null;
   }
 
+  public String toString() {
+    return "Mote interfaces handler (" + allInterfaces.size() + " mote interfaces)";
+  }
 }
diff --git a/tools/cooja/java/se/sics/cooja/MoteType.java b/tools/cooja/java/se/sics/cooja/MoteType.java
index b6304f34e..a66b6dac6 100644
--- a/tools/cooja/java/se/sics/cooja/MoteType.java
+++ b/tools/cooja/java/se/sics/cooja/MoteType.java
@@ -24,7 +24,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: MoteType.java,v 1.9 2009/03/09 15:40:26 fros4943 Exp $
+ * $Id: MoteType.java,v 1.10 2009/03/10 21:05:00 fros4943 Exp $
  */
 
 package se.sics.cooja;
@@ -35,18 +35,19 @@ import java.util.Collection;
 import javax.swing.JPanel;
 import org.jdom.Element;
 
+import se.sics.cooja.contikimote.ContikiMoteType;
 import se.sics.cooja.dialogs.MessageList;
 
 /**
  * The mote type defines properties common for several motes. These properties
  * may differ between different implementations, but typically includes how a
- * mote of that type is initialized, which hardware peripherals each mote has
- * etc.
- * Every simulated motes must belong to a mote type.
+ * mote is initialized, which hardware peripherals each mote has
+ * etc. All simulated motes belongs to one mote type.
  *
  * A mote type may also hold the connection to an underlying simulation
  * framework, such as a compiled Contiki system.
  *
+ * @see ContikiMoteType
  * @author Fredrik Osterlind
  */
 public interface MoteType {