diff --git a/src/java/org/lwjgl/input/Keyboard.java b/src/java/org/lwjgl/input/Keyboard.java
index f94fa073..47ff57dc 100644
--- a/src/java/org/lwjgl/input/Keyboard.java
+++ b/src/java/org/lwjgl/input/Keyboard.java
@@ -192,14 +192,14 @@ public class Keyboard {
 	/**
 	 * The left windows key, mapped to KEY_LMETA
 	 *
-	 * @Deprecated Use KEY_LMETA instead
+	 * @deprecated Use KEY_LMETA instead
 	 */
 	public static final int KEY_LWIN            = KEY_LMETA; /* Left Windows key */
 	public static final int KEY_RMETA            = 0xDC; /* Right Windows/Option key */
 	/**
 	 * The right windows key, mapped to KEY_RMETA
 	 *
-	 * @Deprecated Use KEY_RMETA instead
+	 * @deprecated Use KEY_RMETA instead
 	 */
 	public static final int KEY_RWIN            = KEY_RMETA; /* Right Windows key */
 	public static final int KEY_APPS            = 0xDD; /* AppMenu key */
@@ -563,7 +563,7 @@ public class Keyboard {
 	}
 
 	/**
-	 * @see org.lwjgl.input.Keyboard#enableRepeatEvents()
+	 * @see org.lwjgl.input.Keyboard#enableRepeatEvents(boolean)
 	 * @return true if the current event is a repeat event, false if
 	 * the current event is not a repeat even or if repeat events are disabled.
 	 */
diff --git a/src/java/org/lwjgl/input/Mouse.java b/src/java/org/lwjgl/input/Mouse.java
index 62f3f0af..8fca9bbb 100644
--- a/src/java/org/lwjgl/input/Mouse.java
+++ b/src/java/org/lwjgl/input/Mouse.java
@@ -186,9 +186,9 @@ public class Mouse {
 	 * Set the position of the cursor. If the cursor is not grabbed,
 	 * the native cursor is moved to the new position.
 	 *
-	 * @param x The x coordinate of the new cursor position in OpenGL coordinates relative
+	 * @param new_x The x coordinate of the new cursor position in OpenGL coordinates relative
 	 *			to the window origin.
-	 * @param y The y coordinate of the new cursor position in OpenGL coordinates relative
+	 * @param new_y The y coordinate of the new cursor position in OpenGL coordinates relative
 	 *			to the window origin.
 	 */
 	public static void setCursorPosition(int new_x, int new_y) {
diff --git a/src/java/org/lwjgl/opengl/Display.java b/src/java/org/lwjgl/opengl/Display.java
index cf15fd2f..fd9014eb 100644
--- a/src/java/org/lwjgl/opengl/Display.java
+++ b/src/java/org/lwjgl/opengl/Display.java
@@ -899,7 +899,7 @@ public final class Display {
 	 *
 	 * A video frame period is the time required to display a full frame of video data.
 	 *
-	 * @param sync true to synchronize; false to ignore synchronization
+	 * @param value The swap interval in frames, 0 to disable
 	 */
 	public static void setSwapInterval(int value) {
 		synchronized (GlobalLock.lock) {
@@ -926,9 +926,9 @@ public final class Display {
 	 * The window is clamped to remain entirely on the screen. If you attempt
 	 * to position the window such that it would extend off the screen, the window
 	 * is simply placed as close to the edge as possible.
-   * <br><b>note</b>If no location has been specified (or x == y == -1) the window will be centered
-	 * @param x The new window location on the x axis
-   * @param y The new window location on the y axis
+	 * <br><b>note</b>If no location has been specified (or x == y == -1) the window will be centered
+	 * @param new_x The new window location on the x axis
+	 * @param new_y The new window location on the y axis
 	 */
 	public static void setLocation(int new_x, int new_y) {
 		synchronized (GlobalLock.lock) {
diff --git a/src/templates/org/lwjgl/openal/AL11.java b/src/templates/org/lwjgl/openal/AL11.java
index 6c029c68..d0bbf704 100644
--- a/src/templates/org/lwjgl/openal/AL11.java
+++ b/src/templates/org/lwjgl/openal/AL11.java
@@ -68,7 +68,7 @@ public interface AL11 {
 	/** Type of source: when it has the NULL buffer attached */
 	public static final int AL_UNDETERMINED							= 0x1030;
 
-	/** @see AL10.AL_INVALID_OPERATION */
+	/** @see AL10#AL_INVALID_OPERATION */
 	public static final int AL_ILLEGAL_COMMAND						= 0xA004;
 	
 	/** Speed of Sound in units per second */
diff --git a/src/templates/org/lwjgl/opengl/GL20.java b/src/templates/org/lwjgl/opengl/GL20.java
index ada0b38f..0889851d 100644
--- a/src/templates/org/lwjgl/opengl/GL20.java
+++ b/src/templates/org/lwjgl/opengl/GL20.java
@@ -223,7 +223,6 @@ public interface GL20 {
 	 * @param program
 	 * @param name
 	 *
-	 * @return
 	 */
 	int glGetUniformLocation(@GLuint int program, @NullTerminated @Check("1") @Const @GLchar ByteBuffer name);