diff --git a/java/src/edu/wpi/first/wpilibj/networktables/NetworkTable.java b/java/src/edu/wpi/first/wpilibj/networktables/NetworkTable.java
index ea0844aa12..78c8b3b867 100644
--- a/java/src/edu/wpi/first/wpilibj/networktables/NetworkTable.java
+++ b/java/src/edu/wpi/first/wpilibj/networktables/NetworkTable.java
@@ -102,7 +102,7 @@ public class NetworkTable implements ITable, IRemote {
   }
 
   /**
-   * @param port the port number that network tables will connect to in client
+   * @param aport the port number that network tables will connect to in client
    * mode or listen to in server mode
    */
   public synchronized static void setPort(int aport) {
@@ -1045,7 +1045,7 @@ public class NetworkTable implements ITable, IRemote {
    * Returns the value at the specified key.
    * @param key the key
    * @return the value
-   * @throws NoSuchEleNetworkTableKeyNotDefinedmentException if there is no
+   * @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
@@ -1061,7 +1061,7 @@ public class NetworkTable implements ITable, IRemote {
    * @param key the key
    * @param defaultValue the value returned if the key is undefined
    * @return the value
-   * @throws NoSuchEleNetworkTableKeyNotDefinedmentException if there is no
+   * @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
diff --git a/java/src/edu/wpi/first/wpilibj/networktables2/type/BooleanArray.java b/java/src/edu/wpi/first/wpilibj/networktables2/type/BooleanArray.java
index d80d6e2b4c..f2c78e6100 100644
--- a/java/src/edu/wpi/first/wpilibj/networktables2/type/BooleanArray.java
+++ b/java/src/edu/wpi/first/wpilibj/networktables2/type/BooleanArray.java
@@ -1,7 +1,7 @@
 package edu.wpi.first.wpilibj.networktables2.type;
 
 /**
- * @deprecated Use ArrayList<Boolean> instead.
+ * @deprecated Use {@literal ArrayList<Boolean>} instead.
  */
 public class BooleanArray extends ArrayData {
   public boolean get(int index) {
diff --git a/java/src/edu/wpi/first/wpilibj/networktables2/type/NumberArray.java b/java/src/edu/wpi/first/wpilibj/networktables2/type/NumberArray.java
index 800f625a50..1066159e2e 100644
--- a/java/src/edu/wpi/first/wpilibj/networktables2/type/NumberArray.java
+++ b/java/src/edu/wpi/first/wpilibj/networktables2/type/NumberArray.java
@@ -1,7 +1,7 @@
 package edu.wpi.first.wpilibj.networktables2.type;
 
 /**
- * @deprecated Use ArrayList<Double> instead.
+ * @deprecated Use {@literal ArrayList<Double>} instead.
  */
 public class NumberArray extends ArrayData {
   public double get(int index) {
diff --git a/java/src/edu/wpi/first/wpilibj/networktables2/type/StringArray.java b/java/src/edu/wpi/first/wpilibj/networktables2/type/StringArray.java
index 9df91029ba..5eea0d312e 100644
--- a/java/src/edu/wpi/first/wpilibj/networktables2/type/StringArray.java
+++ b/java/src/edu/wpi/first/wpilibj/networktables2/type/StringArray.java
@@ -1,7 +1,7 @@
 package edu.wpi.first.wpilibj.networktables2.type;
 
 /**
- * @deprecated Use ArrayList<String> instead.
+ * @deprecated Use {@literal ArrayList<String>} instead.
  */
 public class StringArray extends ArrayData {
   public String get(int index) {
diff --git a/java/src/edu/wpi/first/wpilibj/tables/ITable.java b/java/src/edu/wpi/first/wpilibj/tables/ITable.java
index 40ad37dd73..42fb73ddc4 100644
--- a/java/src/edu/wpi/first/wpilibj/tables/ITable.java
+++ b/java/src/edu/wpi/first/wpilibj/tables/ITable.java
@@ -344,12 +344,12 @@ public interface ITable {
                                  int flags);
   /**
    * This will immediately notify the listener of all current sub tables
-   * @param listener
+   * @param listener the listener to notify
    */
   public void addSubTableListener(final ITableListener listener);
   /**
    * This will immediately notify the listener of all current sub tables
-   * @param listener
+   * @param listener the listener to notify
    * @param localNotify if true then this listener will be notified of all
    * local changes in addition to all remote changes
    */
@@ -397,7 +397,7 @@ public interface ITable {
    * @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
@@ -423,7 +423,7 @@ public interface ITable {
    * Returns the value at the specified key.
    * @param key the key
    * @return the value
-   * @throws NoSuchEleNetworkTableKeyNotDefinedmentException if there is no
+   * @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
@@ -437,7 +437,7 @@ public interface ITable {
    * @param key the key
    * @param defaultValue the value returned if the key is undefined
    * @return the value
-   * @throws NoSuchEleNetworkTableKeyNotDefinedmentException if there is no
+   * @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