diff --git a/src/java/org/lwjgl/test/WindowCreationTest.java b/src/java/org/lwjgl/test/WindowCreationTest.java
index 43308df7..6eaf0c8d 100644
--- a/src/java/org/lwjgl/test/WindowCreationTest.java
+++ b/src/java/org/lwjgl/test/WindowCreationTest.java
@@ -1,8 +1,33 @@
 /*
- * Created on 18-03-2003
+ * Copyright (c) 2004 Lightweight Java Game Library Project
+ * All rights reserved.
  *
- * To change this generated comment go to 
- * Window>Preferences>Java>Code Generation>Code Template
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ *
+ * * Neither the name of 'Lightweight Java Game Library' nor the names of
+ *   its contributors may be used to endorse or promote products derived
+ *   from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package org.lwjgl.test;
 
@@ -10,26 +35,36 @@ import org.lwjgl.*;
 import org.lwjgl.opengl.Window;
 
 /**
- * @author Brian
+ * Small class for testing that the Window is creatable
+ * If this class can't run, LWJGL wont work!
+ * 
+ * @author Brian Matzon <brian@matzon.dk>
  */
 public class WindowCreationTest {
 
+  /**
+   * Main entry point
+   * 
+   * @param args ignored params to app
+   */
 	public static void main(String[] args) {
+    // get avaialble modes, and print out
     DisplayMode[] modes = Display.getAvailableDisplayModes();
     System.out.println("Found " + modes.length + " display modes");
     
-    
+    // Create the actual window
     try {
       Window.create("WindowCreationTest", 50, 50, 320, 240, 16, 0, 0, 0);
     } catch (Exception e) {
 			e.printStackTrace();
+      System.out.println("Unable to create window!, exiting...");
+      System.exit(-1);
 		}
 
+    System.out.println("Window created");
     System.out.println(Window.getHeight() + ", " + Window.getWidth() + ", " + Window.getTitle());
 
-    
-    System.out.println("Display created");
-
+    // wait for user to close window
     while(!Window.isCloseRequested()) {    
       Window.update();
       try {
@@ -39,6 +74,7 @@ public class WindowCreationTest {
       } 
     }
     
+    // nuke window and get out
     Window.destroy();
 	}
 }