diff --git a/src/java/org/jnativehook/GlobalScreen.java b/src/java/org/jnativehook/GlobalScreen.java
index d2b58735..b9f57403 100644
--- a/src/java/org/jnativehook/GlobalScreen.java
+++ b/src/java/org/jnativehook/GlobalScreen.java
@@ -224,6 +224,7 @@ public static void removeNativeMouseWheelListener(NativeMouseWheelListener liste
 	/**
 	 * Get information about the native monitor configuration and layout.
 	 *
+	 * @return an array of <code>NativeMonitorInfo</code> objects.
 	 * @since 2.1
 	 */
 	public static native NativeMonitorInfo[] getNativeMonitors();
@@ -231,6 +232,7 @@ public static void removeNativeMouseWheelListener(NativeMouseWheelListener liste
 	/**
 	 * Retrieves the keyboard auto repeat rate.
 	 *
+	 * @return <code>Integer</code> or null.
 	 * @since 2.1
  	 */
 	public static native Integer getAutoRepeatRate();
@@ -238,6 +240,7 @@ public static void removeNativeMouseWheelListener(NativeMouseWheelListener liste
 	/**
 	 * Retrieves the keyboard auto repeat delay.
 	 *
+	 * @return <code>Integer</code> or null.
 	 * @since 2.1
 	 */
 	public static native Integer getAutoRepeatDelay();
@@ -245,6 +248,7 @@ public static void removeNativeMouseWheelListener(NativeMouseWheelListener liste
 	/**
 	 * Retrieves the mouse acceleration multiplier.
 	 *
+	 * @return <code>Integer</code> or null.
 	 * @since 2.1
 	 */
 	public static native Integer getPointerAccelerationMultiplier();
@@ -252,6 +256,7 @@ public static void removeNativeMouseWheelListener(NativeMouseWheelListener liste
 	/**
 	 * Retrieves the mouse acceleration threshold.
 	 *
+	 * @return <code>Integer</code> or null.
 	 * @since 2.1
 	 */
 	public static native Integer getPointerAccelerationThreshold();
@@ -259,6 +264,7 @@ public static void removeNativeMouseWheelListener(NativeMouseWheelListener liste
 	/**
 	 * Retrieves the mouse sensitivity.
 	 *
+	 * @return <code>Integer</code> or null.
 	 * @since 2.1
 	 */
 	public static native Integer getPointerSensitivity();
@@ -266,6 +272,7 @@ public static void removeNativeMouseWheelListener(NativeMouseWheelListener liste
 	/**
 	 * Retrieves the double/triple click interval in milliseconds.
 	 *
+	 * @return <code>Integer</code> or null.
 	 * @since 2.1
 	 */
 	public static native Integer getMultiClickIterval();
@@ -277,7 +284,7 @@ protected static class NativeHookThread extends Thread {
 		/**
 		 * Exception thrown by this thread.
 		 */
-		private NativeHookException exception;
+		protected NativeHookException exception;
 
 		/**
 		 * Default constructor.
@@ -318,11 +325,15 @@ public NativeHookException getException() {
 		 * Native implementation to start the input hook.  This method blocks and should only be called by this
 		 * specialized thread implementation.  This method will notifyAll() after passing any exception exception
 		 * throwing code.
+		 *
+		 * @throws NativeHookException problem registering the native hook with the underlying operating system.
 		 */
-		private native void enable() throws NativeHookException;
+		protected native void enable() throws NativeHookException;
 
 		/**
 		 * Native implementation to stop the input hook.  There is no other way to stop the hook.
+		 *
+		 * @throws NativeHookException problem un-registering the native hook with the underlying operating system.
 		 */
 		public native void disable() throws NativeHookException;
 
@@ -359,8 +370,7 @@ protected static void dispatchEvent(NativeInputEvent event) {
 	 * <code>Load "record"</code> is missing for the xorg.conf file on
 	 * Unix/Linux/Solaris platforms.
 	 *
-	 * @throws NativeHookException problem registering the native hook with
-	 *                             the underlying operating system.
+	 * @throws NativeHookException problem registering the native hook with the underlying operating system.
 	 * @since 1.1
 	 */
 	public static void registerNativeHook() throws NativeHookException {
@@ -389,7 +399,6 @@ public static void registerNativeHook() throws NativeHookException {
 	 * hook it is not registered the function has no effect.
 	 *
 	 * @throws NativeHookException hook interrupted by Java.
-	 *
 	 * @since 1.1
 	 */
 	public static void unregisterNativeHook() throws NativeHookException {
diff --git a/src/java/org/jnativehook/NativeMonitorInfo.java b/src/java/org/jnativehook/NativeMonitorInfo.java
index 1539884f..8e113a41 100644
--- a/src/java/org/jnativehook/NativeMonitorInfo.java
+++ b/src/java/org/jnativehook/NativeMonitorInfo.java
@@ -77,7 +77,9 @@ public NativeMonitorInfo(short number, int x, int y, short width, short height)
 	}
 
 	/**
-	 * Get the logical number for this display.  The primary display will always be zero.
+	 * Get the logical number of this display.  The primary display will always be zero.
+	 *
+	 * @return the logical number of this display.
 	 */
 	public short getNumber() {
 		return number;
@@ -85,6 +87,8 @@ public short getNumber() {
 
 	/**
 	 * Set the logical number for this display.
+	 *
+	 * @param number the logical number of this display.
 	 */
 	public void setNumber(short number) {
 		this.number = number;