diff --git a/wpilibj/wpilibJava/src/main/java/edu/wpi/first/wpilibj/buttons/Button.java b/wpilibj/wpilibJava/src/main/java/edu/wpi/first/wpilibj/buttons/Button.java
index 54cefba333..02981c2212 100644
--- a/wpilibj/wpilibJava/src/main/java/edu/wpi/first/wpilibj/buttons/Button.java
+++ b/wpilibj/wpilibJava/src/main/java/edu/wpi/first/wpilibj/buttons/Button.java
@@ -54,7 +54,7 @@ public abstract class Button extends Trigger {
 
     /**
      * Toggles the command whenever the button is pressed (on then off then on)
-     * @param command
+     * @param command the command to start
      */
     public void toggleWhenPressed(final Command command) {
         toggleWhenActive(command);
@@ -62,7 +62,7 @@ public abstract class Button extends Trigger {
 
     /**
      * Cancel the command when the button is pressed
-     * @param command
+     * @param command the command to start
      */
     public void cancelWhenPressed(final Command command) {
         cancelWhenActive(command);
diff --git a/wpilibj/wpilibJava/src/main/java/edu/wpi/first/wpilibj/smartdashboard/SmartDashboard.java b/wpilibj/wpilibJava/src/main/java/edu/wpi/first/wpilibj/smartdashboard/SmartDashboard.java
index c658a20a09..b7c92ead6b 100644
--- a/wpilibj/wpilibJava/src/main/java/edu/wpi/first/wpilibj/smartdashboard/SmartDashboard.java
+++ b/wpilibj/wpilibJava/src/main/java/edu/wpi/first/wpilibj/smartdashboard/SmartDashboard.java
@@ -149,7 +149,7 @@ public class SmartDashboard {
      * @param key the key
      * @param defaultValue the value returned if the key is undefined
      * @return the value
-     * @throws NoSuchEleNetworkTableKeyNotDefinedmentException if there is no value mapped to by the key
+     * @throws NetworkTableKeyNotDefined if there is no value mapped to by the key
      * @throws IllegalArgumentException if the value mapped to by the key is not a double
      * @throws IllegalArgumentException if the key is null
      */
@@ -241,7 +241,7 @@ public class SmartDashboard {
      * @param key the key
      * @param defaultValue the value returned if the key is undefined
      * @return the value
-     * @throws NetworkTableKeyNotDefined if there is no value mapped to by the key
+     * @throws TableKeyNotDefinedException if there is no value mapped to by the key
      * @throws IllegalArgumentException if the value mapped to by the key is not an int
      * @throws IllegalArgumentException if the key is null
      */
@@ -274,7 +274,7 @@ public class SmartDashboard {
      * @deprecated Use {@link #getNumber(java.lang.String) getNumber} instead
      * @param key the key
      * @return the value
-     * @throws NoSuchEleNetworkTableKeyNotDefinedmentException if there is no value mapped to by the key
+     * @throws TableKeyNotDefinedException if there is no value mapped to by the key
      * @throws IllegalArgumentException if the value mapped to by the key is not a double
      * @throws IllegalArgumentException if the key is null
      */
@@ -289,7 +289,7 @@ public class SmartDashboard {
      * @param key the key
      * @param defaultValue the value returned if the key is undefined
      * @return the value
-     * @throws NoSuchEleNetworkTableKeyNotDefinedmentException if there is no value mapped to by the key
+     * @throws TableKeyNotDefinedException if there is no value mapped to by the key
      * @throws IllegalArgumentException if the value mapped to by the key is not a double
      * @throws IllegalArgumentException if the key is null
      */
diff --git a/wpilibj/wpilibJavaDevices/src/main/java/edu/wpi/first/wpilibj/CANTalon.java b/wpilibj/wpilibJavaDevices/src/main/java/edu/wpi/first/wpilibj/CANTalon.java
index dd256c6ab1..cde7b2fa56 100644
--- a/wpilibj/wpilibJavaDevices/src/main/java/edu/wpi/first/wpilibj/CANTalon.java
+++ b/wpilibj/wpilibJavaDevices/src/main/java/edu/wpi/first/wpilibj/CANTalon.java
@@ -360,7 +360,7 @@ public class CANTalon implements MotorSafety, PIDOutput, SpeedController {
   /**
    * Get the current proportional constant.
    *
-   * @returns double proportional constant for current profile.
+   * @return double proportional constant for current profile.
    * @throws IllegalStateException if not in Position of Speed mode.
    */
   public double getP() {
@@ -515,7 +515,7 @@ public class CANTalon implements MotorSafety, PIDOutput, SpeedController {
    * Set the proportional value of the currently selected profile.
    *
    * @param p Proportional constant for the currently selected PID profile.
-   * @see setProfile For selecting a certain profile.
+   * @see #setProfile For selecting a certain profile.
    */
   public void setP(double p) {
     m_impl.SetPgain(m_profile, p);
@@ -525,7 +525,7 @@ public class CANTalon implements MotorSafety, PIDOutput, SpeedController {
    * Set the integration constant of the currently selected profile.
    *
    * @param i Integration constant for the currently selected PID profile.
-   * @see setProfile For selecting a certain profile.
+   * @see #setProfile For selecting a certain profile.
    */
   public void setI(double i) {
     m_impl.SetIgain(m_profile, i);
@@ -535,7 +535,7 @@ public class CANTalon implements MotorSafety, PIDOutput, SpeedController {
    * Set the derivative constant of the currently selected profile.
    *
    * @param d Derivative constant for the currently selected PID profile.
-   * @see setProfile For selecting a certain profile.
+   * @see #setProfile For selecting a certain profile.
    */
   public void setD(double d) {
     m_impl.SetDgain(m_profile, d);
@@ -545,7 +545,7 @@ public class CANTalon implements MotorSafety, PIDOutput, SpeedController {
    * Set the feedforward value of the currently selected profile.
    *
    * @param f Feedforward constant for the currently selected PID profile.
-   * @see setProfile For selecting a certain profile.
+   * @see #setProfile For selecting a certain profile.
    */
   public void setF(double f) {
     m_impl.SetFgain(m_profile, f);
@@ -560,7 +560,7 @@ public class CANTalon implements MotorSafety, PIDOutput, SpeedController {
     * An izone value of 0 means no difference from a standard PIDF loop.
     *
     * @param izone Width of the integration zone.
-    * @see setProfile For selecting a certain profile.
+    * @see #setProfile For selecting a certain profile.
     */
   public void setIZone(int izone) {
     m_impl.SetIzone(m_profile, izone);
@@ -573,7 +573,7 @@ public class CANTalon implements MotorSafety, PIDOutput, SpeedController {
    * Only affects position and speed closed loop modes.
    *
    * @param rampRate Maximum change in voltage, in volts / sec.
-   * @see setProfile For selecting a certain profile.
+   * @see #setProfile For selecting a certain profile.
    */
   public void setCloseLoopRampRate(double rampRate) {
     // CanTalonSRX takes units of Throttle (0 - 1023) / 10ms.
diff --git a/wpilibj/wpilibJavaDevices/src/main/java/edu/wpi/first/wpilibj/InterruptableSensorBase.java b/wpilibj/wpilibJavaDevices/src/main/java/edu/wpi/first/wpilibj/InterruptableSensorBase.java
index 0fbb221f7a..af325f79ab 100644
--- a/wpilibj/wpilibJavaDevices/src/main/java/edu/wpi/first/wpilibj/InterruptableSensorBase.java
+++ b/wpilibj/wpilibJavaDevices/src/main/java/edu/wpi/first/wpilibj/InterruptableSensorBase.java
@@ -107,7 +107,7 @@ public abstract class InterruptableSensorBase extends SensorBase {
 	/**
 	 * Request one of the 8 interrupts synchronously on this digital input. Request
 	 * interrupts in synchronous mode where the user program will have to
-	 * explicitly wait for the interrupt to occur using {@link waitForInterrupt}. 
+	 * explicitly wait for the interrupt to occur using {@link #waitForInterrupt}. 
 	 * The default is interrupt on rising edges only.
 	 */
 	public void requestInterrupts() {
diff --git a/wpilibj/wpilibJavaDevices/src/main/java/edu/wpi/first/wpilibj/Preferences.java b/wpilibj/wpilibJavaDevices/src/main/java/edu/wpi/first/wpilibj/Preferences.java
index 544da698a1..fc58b21da2 100644
--- a/wpilibj/wpilibJavaDevices/src/main/java/edu/wpi/first/wpilibj/Preferences.java
+++ b/wpilibj/wpilibJavaDevices/src/main/java/edu/wpi/first/wpilibj/Preferences.java
@@ -814,7 +814,7 @@ public class Preferences {
          * Returns whether or not the given string is ok to use in the
          * preference table.
          *
-         * @param value
+         * @param value the string to check
          * @return true if the given string is ok to use in the preference table
          */
         public static boolean isAcceptable(String value) {
diff --git a/wpilibj/wpilibJavaDevices/src/main/java/edu/wpi/first/wpilibj/SerialPort.java b/wpilibj/wpilibJavaDevices/src/main/java/edu/wpi/first/wpilibj/SerialPort.java
index a991f555bf..2c5149d1e4 100644
--- a/wpilibj/wpilibJavaDevices/src/main/java/edu/wpi/first/wpilibj/SerialPort.java
+++ b/wpilibj/wpilibJavaDevices/src/main/java/edu/wpi/first/wpilibj/SerialPort.java
@@ -264,7 +264,7 @@ public class SerialPort {
      * Set the type of flow control to enable on this port.
      *
      * By default, flow control is disabled.
-     * @param flowControl
+     * @param flowControl the FlowControl value to use
      */
     public void setFlowControl(FlowControl flowControl) {
 		ByteBuffer status = ByteBuffer.allocateDirect(4);
diff --git a/wpilibj/wpilibJavaFinal/pom.xml b/wpilibj/wpilibJavaFinal/pom.xml
index 00c943ef70..9d6dea3a56 100644
--- a/wpilibj/wpilibJavaFinal/pom.xml
+++ b/wpilibj/wpilibJavaFinal/pom.xml
@@ -1,74 +1,81 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-		 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <groupId>edu.wpi.first.wpilibj</groupId>
   <artifactId>wpilibJavaFinal</artifactId>
   <packaging>jar</packaging>
   <version>0.1.0-SNAPSHOT</version>
-  
+
   <parent>
     <groupId>edu.wpi.first.wpilib.templates.athena</groupId>
     <artifactId>library-jar</artifactId>
     <version>0.1.0-SNAPSHOT</version>
     <relativePath>../../maven-utilities/athena/library-jar/pom.xml</relativePath>
   </parent>
-  
+
   <profiles>
     <profile>
       <id>docline-java8-disable</id>
       <activation>
-	    <jdk>[1.8,</jdk>
+        <jdk>[1.8,</jdk>
       </activation>
 
       <build>
-	    <plugins>
+        <plugins>
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-javadoc-plugin</artifactId>
             <configuration>
               <additionalparam>-Xdoclint:none</additionalparam>
+              <tags>
+                <tag>
+                  <name>pre</name>
+                  <placement>a</placement>
+                  <head>Precondition:</head>
+                </tag>
+              </tags>
             </configuration>
           </plugin>
-	    </plugins>
+        </plugins>
       </build>
     </profile>
   </profiles>
-  
+
   <dependencies>
-	<dependency>
-	  <groupId>edu.wpi.first.wpilibj</groupId>
-	  <artifactId>wpilibJava</artifactId>
-	  <version>0.1.0-SNAPSHOT</version>
-	</dependency>
-	<dependency>
-	  <groupId>edu.wpi.first.wpilibj</groupId>
-	  <artifactId>wpilibJavaDevices</artifactId>
-	  <version>0.1.0-SNAPSHOT</version>
-	</dependency>
-	<dependency>
-	  <groupId>edu.wpi.first.wpilibj</groupId>
-	  <artifactId>wpilibJavaJNI</artifactId>
-	  <version>0.1.0-SNAPSHOT</version>
-	  <type>so</type>
-	</dependency>
-    
-	<dependency>
-	  <groupId>edu.wpi.first.wpilibj</groupId>
-	  <artifactId>wpilibJava</artifactId>
-	  <version>0.1.0-SNAPSHOT</version>
-	  <classifier>sources</classifier>
-	</dependency>
-	<dependency>
-	  <groupId>edu.wpi.first.wpilibj</groupId>
-	  <artifactId>wpilibJavaDevices</artifactId>
-	  <version>0.1.0-SNAPSHOT</version>
-	  <classifier>sources</classifier>
-	</dependency>
+    <dependency>
+      <groupId>edu.wpi.first.wpilibj</groupId>
+      <artifactId>wpilibJava</artifactId>
+      <version>0.1.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>edu.wpi.first.wpilibj</groupId>
+      <artifactId>wpilibJavaDevices</artifactId>
+      <version>0.1.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>edu.wpi.first.wpilibj</groupId>
+      <artifactId>wpilibJavaJNI</artifactId>
+      <version>0.1.0-SNAPSHOT</version>
+      <type>so</type>
+    </dependency>
+
+    <dependency>
+      <groupId>edu.wpi.first.wpilibj</groupId>
+      <artifactId>wpilibJava</artifactId>
+      <version>0.1.0-SNAPSHOT</version>
+      <classifier>sources</classifier>
+    </dependency>
+    <dependency>
+      <groupId>edu.wpi.first.wpilibj</groupId>
+      <artifactId>wpilibJavaDevices</artifactId>
+      <version>0.1.0-SNAPSHOT</version>
+      <classifier>sources</classifier>
+    </dependency>
   </dependencies>
 
   <build>
-	<plugins>
+    <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-antrun-plugin</artifactId>
@@ -96,7 +103,7 @@
                   </then>
                   <else>
                     <copy todir="${project.build.directory}/classes" >
-                      <fileset dir="${mvn.wpilibJava.jar.path}" />  
+                      <fileset dir="${mvn.wpilibJava.jar.path}" />
                     </copy>
                   </else>
                 </if>
@@ -112,7 +119,7 @@
                   </then>
                   <else>
                     <copy todir="${project.build.directory}/classes" >
-                      <fileset dir="${mvn.wpilibJavaDevices.jar.path}" />  
+                      <fileset dir="${mvn.wpilibJavaDevices.jar.path}" />
                     </copy>
                   </else>
                 </if>
@@ -128,12 +135,12 @@
             <phase>generate-sources</phase>
             <configuration>
               <target>
-                <copy todir="${project.build.directory}/classes/linux-arm" 
-                      file="${edu.wpi.first.wpilibj:wpilibJavaJNI:so}" />  
+                <copy todir="${project.build.directory}/classes/linux-arm"
+                      file="${edu.wpi.first.wpilibj:wpilibJavaJNI:so}" />
               </target>
             </configuration>
           </execution>
-          
+
           <execution>
             <id>generate-sources</id>
             <goals>
@@ -172,17 +179,16 @@
           </dependency>
         </dependencies>
       </plugin>
-	   <plugin>
-      	<groupId>org.apache.maven.plugins</groupId>
-      	<artifactId>maven-javadoc-plugin</artifactId>
+       <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-javadoc-plugin</artifactId>
         <configuration>
-      	  <sourceFileExcludes>
-      	    <exclude>edu/wpi/first/wpilibj/image/</exclude>
-      	    <exclude>edu/wpi/first/wpilibj/camera/</exclude>
-      	    <exclude>edu/wpi/first/wpilibj/visa/</exclude>
-      	    <exclude>edu/wpi/first/wpilibj/SerialPort.java</exclude>
-      	  </sourceFileExcludes>
-		   <includeDependencySources>true</includeDependencySources>
+          <sourceFileExcludes>
+            <exclude>edu/wpi/first/wpilibj/image/</exclude>
+            <exclude>edu/wpi/first/wpilibj/camera/</exclude>
+            <exclude>edu/wpi/first/wpilibj/visa/</exclude>
+          </sourceFileExcludes>
+           <includeDependencySources>true</includeDependencySources>
         </configuration>
       </plugin>
 
@@ -201,52 +207,52 @@
           </execution>
         </executions>
       </plugin>
-	</plugins>
-	<pluginManagement>
-	  <plugins>
-		<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
-		<plugin>
-		  <groupId>org.eclipse.m2e</groupId>
-		  <artifactId>lifecycle-mapping</artifactId>
-		  <version>1.0.0</version>
-		  <configuration>
-			<lifecycleMappingMetadata>
-			  <pluginExecutions>
-				<pluginExecution>
-				  <pluginExecutionFilter>
-					<groupId>
-					  org.apache.maven.plugins
-					</groupId>
-					<artifactId>
-					  maven-dependency-plugin
-					</artifactId>
-					<versionRange>[2.8,)</versionRange>
-					<goals>
-					  <goal>copy</goal>
-					</goals>
-				  </pluginExecutionFilter>
-				  <action>
-					<execute />
-				  </action>
-				</pluginExecution>
-				<pluginExecution>
-				  <pluginExecutionFilter>
-					<groupId>org.apache.maven.plugins</groupId>
-        			<artifactId>maven-dependency-plugin</artifactId>
-					<versionRange>[2.8,)</versionRange>
-					<goals>
-					  <goal>unpack</goal>
-					</goals>
-				  </pluginExecutionFilter>
-				  <action>
-					<ignore />
-				  </action>
-				</pluginExecution>
-			  </pluginExecutions>
-			</lifecycleMappingMetadata>
-		  </configuration>
-		</plugin>
-	  </plugins>
-	</pluginManagement>
+    </plugins>
+    <pluginManagement>
+      <plugins>
+        <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
+        <plugin>
+          <groupId>org.eclipse.m2e</groupId>
+          <artifactId>lifecycle-mapping</artifactId>
+          <version>1.0.0</version>
+          <configuration>
+            <lifecycleMappingMetadata>
+              <pluginExecutions>
+                <pluginExecution>
+                  <pluginExecutionFilter>
+                    <groupId>
+                      org.apache.maven.plugins
+                    </groupId>
+                    <artifactId>
+                      maven-dependency-plugin
+                    </artifactId>
+                    <versionRange>[2.8,)</versionRange>
+                    <goals>
+                      <goal>copy</goal>
+                    </goals>
+                  </pluginExecutionFilter>
+                  <action>
+                    <execute />
+                  </action>
+                </pluginExecution>
+                <pluginExecution>
+                  <pluginExecutionFilter>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-dependency-plugin</artifactId>
+                    <versionRange>[2.8,)</versionRange>
+                    <goals>
+                      <goal>unpack</goal>
+                    </goals>
+                  </pluginExecutionFilter>
+                  <action>
+                    <ignore />
+                  </action>
+                </pluginExecution>
+              </pluginExecutions>
+            </lifecycleMappingMetadata>
+          </configuration>
+        </plugin>
+      </plugins>
+    </pluginManagement>
   </build>
 </project>