diff --git a/src/java/org/lwjgl/opengl/ARBBufferObject.java b/src/java/org/lwjgl/opengl/ARBBufferObject.java
index 41ea91c8..dc697211 100644
--- a/src/java/org/lwjgl/opengl/ARBBufferObject.java
+++ b/src/java/org/lwjgl/opengl/ARBBufferObject.java
@@ -118,24 +118,28 @@ public abstract class ARBBufferObject {
 
 	public static native boolean glIsBufferARB(int buffer);
 
-	public static void glBufferDataARB(int target, int size, ByteBuffer data, int usage) {
-		BufferChecks.checkDirectOrNull(data);
-		nglBufferDataARB(target, data != null ? data.remaining() : size, data, data != null ? data.position() : 0, usage);
+	public static void glBufferDataARB(int target, int size, int usage) {
+		nglBufferDataARB(target, size, null, 0, usage);
 	}
 
-	public static void glBufferDataARB(int target, int size, ShortBuffer data, int usage) {
-		BufferChecks.checkDirectOrNull(data);
-		nglBufferDataARB(target, data != null ? data.remaining() << 1 : size, data, data != null ? data.position() << 1 : 0, usage);
+	public static void glBufferDataARB(int target, ByteBuffer data, int usage) {
+		BufferChecks.checkDirect(data);
+		nglBufferDataARB(target, data.remaining(), data, data.position(), usage);
 	}
 
-	public static void glBufferDataARB(int target, int size, FloatBuffer data, int usage) {
-		BufferChecks.checkDirectOrNull(data);
-		nglBufferDataARB(target, data != null ? data.remaining() << 2 : size, data, data != null ? data.position() << 2 : 0, usage);
+	public static void glBufferDataARB(int target, ShortBuffer data, int usage) {
+		BufferChecks.checkDirect(data);
+		nglBufferDataARB(target, data.remaining() << 1, data, data.position() << 1, usage);
 	}
 
-	public static void glBufferDataARB(int target, int size, IntBuffer data, int usage) {
+	public static void glBufferDataARB(int target, FloatBuffer data, int usage) {
 		BufferChecks.checkDirectOrNull(data);
-		nglBufferDataARB(target, data != null ? data.remaining() << 2 : size, data, data != null ? data.position() << 2 : 0, usage);
+		nglBufferDataARB(target, data.remaining() << 2, data, data.position() << 2, usage);
+	}
+
+	public static void glBufferDataARB(int target, IntBuffer data, int usage) {
+		BufferChecks.checkDirectOrNull(data);
+		nglBufferDataARB(target, data.remaining() << 2, data, data.position() << 2, usage);
 	}
 
 	private static native void nglBufferDataARB(int target, int size, Buffer data, int data_offset, int usage);
diff --git a/src/java/org/lwjgl/opengl/ARBProgram.java b/src/java/org/lwjgl/opengl/ARBProgram.java
index 0c29af68..3e01d877 100644
--- a/src/java/org/lwjgl/opengl/ARBProgram.java
+++ b/src/java/org/lwjgl/opengl/ARBProgram.java
@@ -161,12 +161,7 @@ public abstract class ARBProgram {
 	private static native void nglGenProgramsARB(int n, IntBuffer programs, int programsOffset);
 	// ---------------------------
 
-	public static native void glProgramEnvParameter4fARB(int target,
-	                                                     int index,
-	                                                     float x,
-	                                                     float y,
-	                                                     float z,
-	                                                     float w);
+	public static native void glProgramEnvParameter4fARB(int target, int index, float x, float y, float z, float w);
 
 	private static void checkProgramEnv(int index, Buffer buf) {
 		if ( index < 0 ) {
@@ -187,12 +182,7 @@ public abstract class ARBProgram {
 	private static native void nglProgramEnvParameter4fvARB(int target, int index, FloatBuffer params, int paramsOffset);
 	// ---------------------------
 
-	public static native void glProgramLocalParameter4fARB(int target,
-	                                                       int index,
-	                                                       float x,
-	                                                       float y,
-	                                                       float z,
-	                                                       float w);
+	public static native void glProgramLocalParameter4fARB(int target, int index, float x, float y, float z, float w);
 
 	// ---------------------------
 	public static void glProgramLocalParameterARB(int target, int index, FloatBuffer params) {
diff --git a/src/java/org/lwjgl/opengl/GL15.java b/src/java/org/lwjgl/opengl/GL15.java
index 1a902fa3..21e4d8c0 100644
--- a/src/java/org/lwjgl/opengl/GL15.java
+++ b/src/java/org/lwjgl/opengl/GL15.java
@@ -118,24 +118,28 @@ public final class GL15 {
 
 	public static native boolean glIsBuffer(int buffer);
 
-	public static void glBufferData(int target, int size, ByteBuffer data, int usage) {
-		BufferChecks.checkDirectOrNull(data);
-		nglBufferData(target, data != null ? data.remaining() : size, data, data != null ? data.position() : 0, usage);
+	public static void glBufferData(int target, int size, int usage) {
+		nglBufferData(target, size, null, 0, usage);
 	}
 
-	public static void glBufferData(int target, int size, ShortBuffer data, int usage) {
-		BufferChecks.checkDirectOrNull(data);
-		nglBufferData(target, data != null ? data.remaining() << 1 : size, data, data != null ? data.position() << 1 : 0, usage);
+	public static void glBufferData(int target, ByteBuffer data, int usage) {
+		BufferChecks.checkDirect(data);
+		nglBufferData(target, data.remaining(), data, data.position(), usage);
 	}
 
-	public static void glBufferData(int target, int size, FloatBuffer data, int usage) {
-		BufferChecks.checkDirectOrNull(data);
-		nglBufferData(target, data != null ? data.remaining() << 2 : size, data, data != null ? data.position() << 2 : 0, usage);
+	public static void glBufferData(int target, ShortBuffer data, int usage) {
+		BufferChecks.checkDirect(data);
+		nglBufferData(target, data.remaining() << 1, data, data.position() << 1, usage);
 	}
 
-	public static void glBufferData(int target, int size, IntBuffer data, int usage) {
-		BufferChecks.checkDirectOrNull(data);
-		nglBufferData(target, data != null ? data.remaining() << 2 : size, data, data != null ? data.position() << 2 : 0, usage);
+	public static void glBufferData(int target, FloatBuffer data, int usage) {
+		BufferChecks.checkDirect(data);
+		nglBufferData(target, data.remaining() << 2, data, data.position() << 2, usage);
+	}
+
+	public static void glBufferData(int target, IntBuffer data, int usage) {
+		BufferChecks.checkDirect(data);
+		nglBufferData(target, data.remaining() << 2, data, data.position() << 2, usage);
 	}
 
 	private static native void nglBufferData(int target, int size, Buffer data, int data_offset, int usage);
diff --git a/src/java/org/lwjgl/util/GL.java b/src/java/org/lwjgl/util/GL.java
index 04f4dc30..6dce5e0b 100644
--- a/src/java/org/lwjgl/util/GL.java
+++ b/src/java/org/lwjgl/util/GL.java
@@ -3164,41 +3164,46 @@ public class GL {
 	/**
 	 * @param target
 	 * @param size
-	 * @param data
 	 * @param usage
-	 */
-	public static void glBufferData(int target, int size, ByteBuffer data, int usage) {
-		GL15.glBufferData(target, size, data, usage);
+	 */ 
+	public static void glBufferData(int target, int size, int usage) {
+		GL15.glBufferData(target, size, usage);
 	}
 
 	/**
 	 * @param target
-	 * @param size
 	 * @param data
 	 * @param usage
 	 */
-	public static void glBufferData(int target, int size, FloatBuffer data, int usage) {
-		GL15.glBufferData(target, size, data, usage);
+	public static void glBufferData(int target, ByteBuffer data, int usage) {
+		GL15.glBufferData(target, data, usage);
 	}
 
 	/**
 	 * @param target
-	 * @param size
 	 * @param data
 	 * @param usage
 	 */
-	public static void glBufferData(int target, int size, IntBuffer data, int usage) {
-		GL15.glBufferData(target, size, data, usage);
+	public static void glBufferData(int target, FloatBuffer data, int usage) {
+		GL15.glBufferData(target, data, usage);
 	}
 
 	/**
 	 * @param target
-	 * @param size
 	 * @param data
 	 * @param usage
 	 */
-	public static void glBufferData(int target, int size, ShortBuffer data, int usage) {
-		GL15.glBufferData(target, size, data, usage);
+	public static void glBufferData(int target, IntBuffer data, int usage) {
+		GL15.glBufferData(target, data, usage);
+	}
+
+	/**
+	 * @param target
+	 * @param data
+	 * @param usage
+	 */
+	public static void glBufferData(int target, ShortBuffer data, int usage) {
+		GL15.glBufferData(target, data, usage);
 	}
 
 	/**
@@ -3395,41 +3400,46 @@ public class GL {
 	/**
 	 * @param target
 	 * @param size
-	 * @param data
 	 * @param usage
 	 */
-	public static void glBufferDataARB(int target, int size, ByteBuffer data, int usage) {
-		ARBBufferObject.glBufferDataARB(target, size, data, usage);
+	public static void glBufferDataARB(int target, int size, int usage) {
+		ARBBufferObject.glBufferDataARB(target, size, usage);
 	}
 
 	/**
 	 * @param target
-	 * @param size
 	 * @param data
 	 * @param usage
 	 */
-	public static void glBufferDataARB(int target, int size, FloatBuffer data, int usage) {
-		ARBBufferObject.glBufferDataARB(target, size, data, usage);
+	public static void glBufferDataARB(int target, ByteBuffer data, int usage) {
+		ARBBufferObject.glBufferDataARB(target, data, usage);
 	}
 
 	/**
 	 * @param target
-	 * @param size
 	 * @param data
 	 * @param usage
 	 */
-	public static void glBufferDataARB(int target, int size, IntBuffer data, int usage) {
-		ARBBufferObject.glBufferDataARB(target, size, data, usage);
+	public static void glBufferDataARB(int target, FloatBuffer data, int usage) {
+		ARBBufferObject.glBufferDataARB(target, data, usage);
 	}
 
 	/**
 	 * @param target
-	 * @param size
 	 * @param data
 	 * @param usage
 	 */
-	public static void glBufferDataARB(int target, int size, ShortBuffer data, int usage) {
-		ARBBufferObject.glBufferDataARB(target, size, data, usage);
+	public static void glBufferDataARB(int target, IntBuffer data, int usage) {
+		ARBBufferObject.glBufferDataARB(target, data, usage);
+	}
+
+	/**
+	 * @param target
+	 * @param data
+	 * @param usage
+	 */
+	public static void glBufferDataARB(int target, ShortBuffer data, int usage) {
+		ARBBufferObject.glBufferDataARB(target, data, usage);
 	}
 
 	/**
diff --git a/src/java/org/lwjgl/util/GLImpl.java b/src/java/org/lwjgl/util/GLImpl.java
index 3b852ad9..8dc5d9a1 100644
--- a/src/java/org/lwjgl/util/GLImpl.java
+++ b/src/java/org/lwjgl/util/GLImpl.java
@@ -318,81 +318,91 @@ public class GLImpl implements IGL {
 	/**
 	 * @param target
 	 * @param size
+	 * @param usage
+	 */
+	public void glBufferData(int target, int size, int usage) {
+		GL.glBufferData(target, size, usage);
+	}
+
+	/**
+	 * @param target
 	 * @param data
 	 * @param usage
 	 */
-	public void glBufferData(int target, int size, ByteBuffer data, int usage) {
-		GL.glBufferData(target, size, data, usage);
+	public void glBufferData(int target, ByteBuffer data, int usage) {
+		GL.glBufferData(target, data, usage);
+	}
+
+	/**
+	 * @param target
+	 * @param data
+	 * @param usage
+	 */
+	public void glBufferData(int target, FloatBuffer data, int usage) {
+		GL.glBufferData(target, data, usage);
+	}
+
+	/**
+	 * @param target
+	 * @param data
+	 * @param usage
+	 */
+	public void glBufferData(int target, IntBuffer data, int usage) {
+		GL.glBufferData(target, data, usage);
+	}
+
+	/**
+	 * @param target
+	 * @param data
+	 * @param usage
+	 */
+	public void glBufferData(int target, ShortBuffer data, int usage) {
+		GL.glBufferData(target, data, usage);
 	}
 
 	/**
 	 * @param target
 	 * @param size
-	 * @param data
 	 * @param usage
 	 */
-	public void glBufferData(int target, int size, FloatBuffer data, int usage) {
-		GL.glBufferData(target, size, data, usage);
+	public void glBufferDataARB(int target, int size, int usage) {
+		GL.glBufferDataARB(target, size, usage);
 	}
 
 	/**
 	 * @param target
-	 * @param size
 	 * @param data
 	 * @param usage
 	 */
-	public void glBufferData(int target, int size, IntBuffer data, int usage) {
-		GL.glBufferData(target, size, data, usage);
+	public void glBufferDataARB(int target, ByteBuffer data, int usage) {
+		GL.glBufferDataARB(target, data, usage);
 	}
 
 	/**
 	 * @param target
-	 * @param size
 	 * @param data
 	 * @param usage
 	 */
-	public void glBufferData(int target, int size, ShortBuffer data, int usage) {
-		GL.glBufferData(target, size, data, usage);
+	public void glBufferDataARB(int target, FloatBuffer data, int usage) {
+		GL.glBufferDataARB(target, data, usage);
 	}
 
 	/**
 	 * @param target
-	 * @param size
 	 * @param data
 	 * @param usage
 	 */
-	public void glBufferDataARB(int target, int size, ByteBuffer data, int usage) {
-		GL.glBufferDataARB(target, size, data, usage);
+	public void glBufferDataARB(int target, IntBuffer data, int usage) {
+		GL.glBufferDataARB(target, data, usage);
 	}
 
 	/**
 	 * @param target
-	 * @param size
 	 * @param data
 	 * @param usage
 	 */
-	public void glBufferDataARB(int target, int size, FloatBuffer data, int usage) {
-		GL.glBufferDataARB(target, size, data, usage);
-	}
-
-	/**
-	 * @param target
-	 * @param size
-	 * @param data
-	 * @param usage
-	 */
-	public void glBufferDataARB(int target, int size, IntBuffer data, int usage) {
-		GL.glBufferDataARB(target, size, data, usage);
-	}
-
-	/**
-	 * @param target
-	 * @param size
-	 * @param data
-	 * @param usage
-	 */
-	public void glBufferDataARB(int target, int size, ShortBuffer data, int usage) {
-		GL.glBufferDataARB(target, size, data, usage);
+	public void glBufferDataARB(int target, ShortBuffer data, int usage) {
+		GL.glBufferDataARB(target, data, usage);
 	}
 
 	/**
diff --git a/src/java/org/lwjgl/util/IGL.java b/src/java/org/lwjgl/util/IGL.java
index c8b74f17..bad47d47 100644
--- a/src/java/org/lwjgl/util/IGL.java
+++ b/src/java/org/lwjgl/util/IGL.java
@@ -2649,34 +2649,37 @@ public interface IGL {
 	/**
 	 * @param target
 	 * @param size
-	 * @param data
 	 * @param usage
 	 */
-	void glBufferData(int target, int size, ByteBuffer data, int usage);
+	void glBufferData(int target, int size, int usage);
 
 	/**
 	 * @param target
-	 * @param size
 	 * @param data
 	 * @param usage
 	 */
-	void glBufferData(int target, int size, FloatBuffer data, int usage);
+	void glBufferData(int target, ByteBuffer data, int usage);
 
 	/**
 	 * @param target
-	 * @param size
 	 * @param data
 	 * @param usage
 	 */
-	void glBufferData(int target, int size, IntBuffer data, int usage);
+	void glBufferData(int target, FloatBuffer data, int usage);
 
 	/**
 	 * @param target
-	 * @param size
 	 * @param data
 	 * @param usage
 	 */
-	void glBufferData(int target, int size, ShortBuffer data, int usage);
+	void glBufferData(int target, IntBuffer data, int usage);
+
+	/**
+	 * @param target
+	 * @param data
+	 * @param usage
+	 */
+	void glBufferData(int target, ShortBuffer data, int usage);
 
 	/**
 	 * @param target
@@ -2836,34 +2839,37 @@ public interface IGL {
 	/**
 	 * @param target
 	 * @param size
-	 * @param data
 	 * @param usage
 	 */
-	void glBufferDataARB(int target, int size, ByteBuffer data, int usage);
+	void glBufferDataARB(int target, int size, int usage);
 
 	/**
 	 * @param target
-	 * @param size
 	 * @param data
 	 * @param usage
 	 */
-	void glBufferDataARB(int target, int size, FloatBuffer data, int usage);
+	void glBufferDataARB(int target, ByteBuffer data, int usage);
 
 	/**
 	 * @param target
-	 * @param size
 	 * @param data
 	 * @param usage
 	 */
-	void glBufferDataARB(int target, int size, IntBuffer data, int usage);
+	void glBufferDataARB(int target, FloatBuffer data, int usage);
 
 	/**
 	 * @param target
-	 * @param size
 	 * @param data
 	 * @param usage
 	 */
-	void glBufferDataARB(int target, int size, ShortBuffer data, int usage);
+	void glBufferDataARB(int target, IntBuffer data, int usage);
+
+	/**
+	 * @param target
+	 * @param data
+	 * @param usage
+	 */
+	void glBufferDataARB(int target, ShortBuffer data, int usage);
 
 	/**
 	 * @param target