diff --git a/core/src/processing/core/PApplet.java b/core/src/processing/core/PApplet.java
index 92d8d8013..388ea6530 100644
--- a/core/src/processing/core/PApplet.java
+++ b/core/src/processing/core/PApplet.java
@@ -6037,7 +6037,6 @@ public class PApplet extends Applet
    * @webref input:files
    * @param filename name of a file in the data folder or a URL.
    * @see XML
-   * @see PApplet#createXML(String)
    * @see PApplet#parseXML(String)
    * @see PApplet#saveXML(XML, String)
    * @see PApplet#loadBytes(String)
@@ -6069,7 +6068,6 @@ public class PApplet extends Applet
    * @param data the content to be parsed as XML
    * @return an XML object, or null
    * @see XML
-   * @see PApplet#createXML(String)
    * @see PApplet#loadXML(String)
    * @see PApplet#saveXML(XML, String)
    */
@@ -6093,7 +6091,6 @@ public class PApplet extends Applet
    * @param xml the XML object to save to disk
    * @param filename name of the file to write to
    * @see XML
-   * @see PApplet#createXML(String)
    * @see PApplet#loadXML(String)
    * @see PApplet#parseXML(String)
    */
@@ -6111,12 +6108,16 @@ public class PApplet extends Applet
     return new JSONObject(new StringReader(input));
   }
 
-
+  /**
+   * @webref output:files
+   */
   public JSONObject loadJSONObject(String filename) {
     return new JSONObject(createReader(filename));
   }
 
-
+  /**
+   * @webref output:files
+   */
   public boolean saveJSONObject(JSONObject json, String filename) {
     return saveJSONObject(json, filename, null);
   }
@@ -6131,12 +6132,16 @@ public class PApplet extends Applet
     return new JSONArray(new StringReader(input));
   }
 
-
+  /**
+   * @webref output:files
+   */
   public JSONArray loadJSONArray(String filename) {
     return new JSONArray(createReader(filename));
   }
 
-
+  /**
+   * @webref output:files
+   */
   public boolean saveJSONArray(JSONArray json, String filename) {
     return saveJSONArray(json, filename);
   }
@@ -6163,7 +6168,6 @@ public class PApplet extends Applet
    * @webref input:files
    * @param filename name of a file in the data folder or a URL.
    * @see Table
-   * @see PApplet#createTable()
    * @see PApplet#saveTable(Table, String)
    * @see PApplet#loadBytes(String)
    * @see PApplet#loadStrings(String)
@@ -6204,7 +6208,6 @@ public class PApplet extends Applet
    * @param table the Table object to save to a file
    * @param filename the filename to which the Table should be saved
    * @see Table
-   * @see PApplet#createTable()
    * @see PApplet#loadTable(String)
    */
   public boolean saveTable(Table table, String filename) {
diff --git a/core/src/processing/data/FloatDict.java b/core/src/processing/data/FloatDict.java
index 7d0f91c7b..effdf4209 100644
--- a/core/src/processing/data/FloatDict.java
+++ b/core/src/processing/data/FloatDict.java
@@ -9,6 +9,8 @@ import processing.core.PApplet;
 
 /**
  * A simple table class to use a String as a lookup for an float value.
+ * 
+ * @webref data:composite
  */
 public class FloatDict {
 
@@ -75,13 +77,21 @@ public class FloatDict {
     }
   }
 
-
+  /**
+   * @webref floatdict:method
+   * @brief To come...
+   */
   public int size() {
     return count;
   }
 
 
-  /** Remove all entries. */
+  /** 
+   * Remove all entries.
+   * 
+   * @webref floatdict:method
+   * @brief Remove all entries
+   */ 
   public void clear() {
     count = 0;
     indices = new HashMap<String, Integer>();
@@ -110,7 +120,10 @@ public class FloatDict {
 //    return keys;
 //  }
 
-
+  /**
+   * @webref floatdict:method
+   * @brief To come...
+   */
   public Iterable<String> keys() {
     return new Iterable<String>() {
 
@@ -167,6 +180,9 @@ public class FloatDict {
 
   /**
    * Return a copy of the internal keys array. This array can be modified.
+   * 
+   * @webref floatdict:method
+   * @brief Return a copy of the internal keys array
    */
   public String[] keyArray() {
     return keyArray(null);
@@ -192,7 +208,10 @@ public class FloatDict {
 //    return values;
 //  }
 
-
+  /**
+   * @webref floatdict:method
+   * @brief To come...
+   */
   public Iterable<Float> values() {
     return new Iterable<Float>() {
 
@@ -220,6 +239,9 @@ public class FloatDict {
 
   /**
    * Create a new array and copy each of the values into it.
+   *
+   * @webref floatdict:method
+   * @brief Create a new array and copy each of the values into it
    */
   public float[] valueArray() {
     return valueArray(null);
@@ -242,6 +264,9 @@ public class FloatDict {
 
   /**
    * Return a value for the specified key.
+   * 
+   * @webref floatdict:method
+   * @brief Return a value for the specified key
    */
   public float get(String key) {
     int index = index(key);
@@ -250,6 +275,10 @@ public class FloatDict {
   }
 
 
+  /**
+   * @webref floatdict:method
+   * @brief To come...
+   */
   public void set(String key, int amount) {
     int index = index(key);
     if (index == -1) {
@@ -260,6 +289,10 @@ public class FloatDict {
   }
 
 
+  /**
+   * @webref floatdict:method
+   * @brief To come...
+   */
   public boolean hasKey(String key) {
     return index(key) != -1;
   }
@@ -277,6 +310,10 @@ public class FloatDict {
 //  }
 
 
+  /**
+   * @webref floatdict:method
+   * @brief To come...
+   */
   public void add(String key, float amount) {
     int index = index(key);
     if (index == -1) {
@@ -293,11 +330,19 @@ public class FloatDict {
 //  }
 
 
+  /**
+   * @webref floatdict:method
+   * @brief To come...
+   */
   public void sub(String key, float amount) {
     add(key, -amount);
   }
 
 
+  /**
+   * @webref floatdict:method
+   * @brief To come...
+   */
   public void mult(String key, float amount) {
     int index = index(key);
     if (index != -1) {
@@ -306,6 +351,10 @@ public class FloatDict {
   }
 
 
+  /**
+   * @webref floatdict:method
+   * @brief To come...
+   */
   public void div(String key, float amount) {
     int index = index(key);
     if (index != -1) {
@@ -341,6 +390,10 @@ public class FloatDict {
   }
 
 
+  /**
+   * @webref floatdict:method
+   * @brief To come...
+   */
   public void remove(String key) {
     removeIndex(index(key));
   }
@@ -389,6 +442,9 @@ public class FloatDict {
   /**
    * Sort the keys alphabetically (ignoring case). Uses the value as a
    * tie-breaker (only really possible with a key that has a case change).
+   * 
+   * @webref floatdict:method
+   * @brief Sort the keys alphabetically 
    */
   public void sortKeys() {
     sortImpl(true, false);
@@ -405,6 +461,10 @@ public class FloatDict {
   }
 
 
+  /**
+   * @webref floatdict:method
+   * @brief To come...
+   */
   public void sortKeysReverse() {
     sortImpl(true, true);
 //    new InternalSort() {
@@ -422,6 +482,9 @@ public class FloatDict {
 
   /**
    * Sort by values in descending order (largest value will be at [0]).
+   * 
+   * @webref floatdict:method
+   * @brief Sort by values in descending order  
    */
   public void sortValues() {
     sortImpl(false, false);
@@ -434,6 +497,10 @@ public class FloatDict {
   }
 
 
+  /**
+   * @webref floatdict:method
+   * @brief To come...
+   */
   public void sortValuesReverse() {
     sortImpl(false, true);
 //    new InternalSort() {
diff --git a/core/src/processing/data/FloatList.java b/core/src/processing/data/FloatList.java
index 8a34c2511..90cbd0e90 100644
--- a/core/src/processing/data/FloatList.java
+++ b/core/src/processing/data/FloatList.java
@@ -7,6 +7,9 @@ import java.util.Random;
 import processing.core.PApplet;
 
 
+/**
+ * @webref data:composite
+ */
 public class FloatList implements Iterable<Float> {
   int count;
   float[] data;
@@ -52,6 +55,9 @@ public class FloatList implements Iterable<Float> {
 
   /**
    * Get the length of the list.
+   *    
+   * @webref floatlist:method
+   * @brief Get the length of the list
    */
   public int size() {
     return count;
@@ -73,6 +79,9 @@ public class FloatList implements Iterable<Float> {
 
   /**
    * Remove all entries from the list.
+   *
+   * @webref floatlist:method
+   * @brief Remove all entries from the list
    */
   public void clear() {
     count = 0;
@@ -81,6 +90,9 @@ public class FloatList implements Iterable<Float> {
 
   /**
    * Get an entry at a particular index.
+   *
+   * @webref floatlist:method
+   * @brief Get an entry at a particular index
    */
   public float get(int index) {
     return data[index];
@@ -91,6 +103,9 @@ public class FloatList implements Iterable<Float> {
    * Set the entry at a particular index. If the index is past the length of
    * the list, it'll expand the list to accommodate, and fill the intermediate
    * entries with 0s.
+   *
+   * @webref floatlist:method
+   * @brief Set the entry at a particular index
    */
   public void set(int index, float what) {
     if (index >= count) {
@@ -104,7 +119,12 @@ public class FloatList implements Iterable<Float> {
   }
 
 
-  /** remove an element from the specified index */
+  /**
+   * Remove an element from the specified index. 
+   * 
+   * @webref floatlist:method
+   * @brief Remove an element from the specified index
+   */
   public void remove(int index) {
 //    int[] outgoing = new int[count - 1];
 //    System.arraycopy(data, 0, outgoing, 0, index);
@@ -205,7 +225,12 @@ public class FloatList implements Iterable<Float> {
 
 
 
-  /** Add a new entry to the list. */
+  /** 
+   * Add a new entry to the list. 
+   *
+   * @webref floatlist:method
+   * @brief Add a new entry to the list
+   */
   public void append(float value) {
     if (count == data.length) {
       data = PApplet.expand(data);
@@ -364,7 +389,10 @@ public class FloatList implements Iterable<Float> {
 //    }
 //  }
 
-
+  /**
+   * @webref floatlist:method
+   * @brief To come...
+   */
   public boolean hasValue(float value) {
     if (Float.isNaN(value)) {
       for (int i = 0; i < count; i++) {
@@ -388,27 +416,42 @@ public class FloatList implements Iterable<Float> {
 //    data[index]++;
 //  }
 
-
+  /**
+   * @webref floatlist:method
+   * @brief To come...
+   */
   public void add(int index, float amount) {
     data[index] += amount;
   }
 
-
+  /**
+   * @webref floatlist:method
+   * @brief To come...
+   */
   public void sub(int index, float amount) {
     data[index] -= amount;
   }
 
-
+  /**
+   * @webref floatlist:method
+   * @brief To come...
+   */
   public void mult(int index, float amount) {
     data[index] *= amount;
   }
 
-
+  /**
+   * @webref floatlist:method
+   * @brief To come...
+   */
   public void div(int index, float amount) {
     data[index] /= amount;
   }
 
-
+  /**
+   * @webref floatlist:method
+   * @brief To come...
+   */
   public float min() {
     if (count == 0) {
       throw new ArrayIndexOutOfBoundsException("Cannot use min() on IntList of length 0.");
@@ -435,7 +478,10 @@ public class FloatList implements Iterable<Float> {
     return m;
   }
 
-
+  /**
+   * @webref floatlist:method
+   * @brief To come...
+   */
   public float max() {
     if (count == 0) {
       throw new ArrayIndexOutOfBoundsException("Cannot use max() on IntList of length 0.");
@@ -463,13 +509,23 @@ public class FloatList implements Iterable<Float> {
   }
 
 
-  /** Sorts the array in place. */
+  /** 
+   * Sorts the array in place. 
+   *
+   * @webref floatlist:method
+   * @brief Sorts an array in place
+   */
   public void sort() {
     Arrays.sort(data, 0, count);
   }
 
 
-  /** reverse sort, orders values from highest to lowest */
+  /** 
+   * Reverse sort, orders values from highest to lowest 
+   *
+   * @webref floatlist:method
+   * @brief To come...
+   */
   public void sortReverse() {
     new Sort() {
       @Override
@@ -509,7 +565,10 @@ public class FloatList implements Iterable<Float> {
     count = num;
   }
 
-
+  /** 
+   * @webref floatlist:method
+   * @brief To come...
+   */
   public void reverse() {
     int ii = count - 1;
     for (int i = 0; i < count/2; i++) {
@@ -524,6 +583,9 @@ public class FloatList implements Iterable<Float> {
   /**
    * Randomize the order of the list elements. Note that this does not
    * obey the randomSeed() function in PApplet.
+   *
+   * @webref floatlist:method
+   * @brief Randomize the order of the list elements
    */
   public void shuffle() {
     Random r = new Random();
@@ -600,6 +662,8 @@ public class FloatList implements Iterable<Float> {
   /**
    * Create a new array with a copy of all the values.
    * @return an array sized by the length of the list with each of the values.
+   * @webref floatlist:method
+   * @brief Create a new array with a copy of all the values
    */
   public int[] array() {
     return array(null);
diff --git a/core/src/processing/data/IntDict.java b/core/src/processing/data/IntDict.java
index 424aaf7ad..117b83d7b 100644
--- a/core/src/processing/data/IntDict.java
+++ b/core/src/processing/data/IntDict.java
@@ -9,6 +9,8 @@ import processing.core.PApplet;
 
 /**
  * A simple class to use a String as a lookup for an int value.
+ * 
+ * @webref data:composite
  */
 public class IntDict {
 
@@ -98,13 +100,21 @@ public class IntDict {
     }
   }
 
-
+  /**
+   * @webref intdict:method
+   * @brief To come...
+   */
   public int size() {
     return count;
   }
 
 
-  /** Remove all entries. */
+  /** 
+   * Remove all entries.
+   * 
+   * @webref intdict:method
+   * @brief Remove all entries
+   */
   public void clear() {
     count = 0;
     indices = new HashMap<String, Integer>();
@@ -127,6 +137,9 @@ public class IntDict {
   /**
    * Return the internal array being used to store the keys. Allocated but
    * unused entries will be removed. This array should not be modified.
+   * 
+   * @webref intdict:method
+   * @brief Return the internal array being used to store the keys
    */
   public String[] keys() {
     crop();
@@ -162,6 +175,9 @@ public class IntDict {
 
   /**
    * Return a copy of the internal keys array. This array can be modified.
+   *
+   * @webref intdict:method
+   * @brief Return a copy of the internal keys array
    */
   public String[] keyArray() {
     return keyArray(null);
@@ -181,7 +197,10 @@ public class IntDict {
     return values[index];
   }
 
-
+  /** 
+   * @webref intdict:method
+   * @brief To come...
+   */
   public Iterable<Integer> values() {
     return new Iterable<Integer>() {
 
@@ -209,6 +228,9 @@ public class IntDict {
 
   /**
    * Create a new array and copy each of the values into it.
+   *
+   * @webref intdict:method
+   * @brief Create a new array and copy each of the values into it
    */
   public int[] valueArray() {
     return valueArray(null);
@@ -231,6 +253,9 @@ public class IntDict {
 
   /**
    * Return a value for the specified key.
+   *
+   * @webref intdict:method
+   * @brief Return a value for the specified key
    */
   public int get(String key) {
     int index = index(key);
@@ -238,7 +263,10 @@ public class IntDict {
     return values[index];
   }
 
-
+  /**
+   * @webref intdict:method
+   * @brief To come...
+   */
   public void set(String key, int amount) {
     int index = index(key);
     if (index == -1) {
@@ -248,18 +276,29 @@ public class IntDict {
     }
   }
 
-
+  /**
+   * @webref intdict:method
+   * @brief To come...
+   */
   public boolean hasKey(String key) {
     return index(key) != -1;
   }
 
 
-  /** Increase the value of a specific key by 1. */
+  /** 
+   * Increase the value of a specific key by 1. 
+   * 
+   * @webref intdict:method
+   * @brief Increase the value of a specific key by 1
+   */
   public void increment(String key) {
     add(key, 1);
   }
 
-
+  /**
+   * @webref intdict:method
+   * @brief To come...
+   */
   public void add(String key, int amount) {
     int index = index(key);
     if (index == -1) {
@@ -269,12 +308,18 @@ public class IntDict {
     }
   }
 
-
+  /**
+   * @webref intdict:method
+   * @brief To come...
+   */
   public void sub(String key, int amount) {
     add(key, -amount);
   }
 
-
+  /**
+   * @webref intdict:method
+   * @brief To come...
+   */
   public void mult(String key, int amount) {
     int index = index(key);
     if (index != -1) {
@@ -282,7 +327,10 @@ public class IntDict {
     }
   }
 
-
+  /**
+   * @webref intdict:method
+   * @brief To come...
+   */
   public void div(String key, int amount) {
     int index = index(key);
     if (index != -1) {
@@ -308,7 +356,10 @@ public class IntDict {
     count++;
   }
 
-
+  /**
+   * @webref intdict:method
+   * @brief To come...
+   */
   public void remove(String key) {
     removeIndex(index(key));
   }
@@ -344,12 +395,18 @@ public class IntDict {
   /**
    * Sort the keys alphabetically (ignoring case). Uses the value as a
    * tie-breaker (only really possible with a key that has a case change).
+   *
+   * @webref intdict:method
+   * @brief Sort the keys alphabetically
    */
   public void sortKeys() {
     sortImpl(true, false);
   }
 
-
+  /**
+   * @webref intdict:method
+   * @brief To come...
+   */
   public void sortKeysReverse() {
     sortImpl(true, true);
   }
@@ -357,12 +414,18 @@ public class IntDict {
 
   /**
    * Sort by values in descending order (largest value will be at [0]).
+   * 
+   * @webref intdict:method
+   * @brief Sort by values in descending order
    */
   public void sortValues() {
     sortImpl(false, false);
   }
 
-
+  /**
+   * @webref intdict:method
+   * @brief To come...
+   */
   public void sortValuesReverse() {
     sortImpl(false, true);
   }
diff --git a/core/src/processing/data/IntList.java b/core/src/processing/data/IntList.java
index a833d23db..d326c0c3b 100644
--- a/core/src/processing/data/IntList.java
+++ b/core/src/processing/data/IntList.java
@@ -16,6 +16,8 @@ import processing.core.PApplet;
  * Helper class for a list of ints. By design (for efficiency), functions like
  * sort() and shuffle() always act on the list itself. To get a sorted copy,
  * use list.copy().sort().
+ * 
+ * @webref data:composite
  */
 public class IntList implements Iterable<Integer> {
   protected int count;
@@ -62,6 +64,9 @@ public class IntList implements Iterable<Integer> {
 
   /**
    * Get the length of the list.
+   * 
+   * @webref floatlist:method
+   * @brief Get the length of the list
    */
   public int size() {
     return count;
@@ -83,6 +88,9 @@ public class IntList implements Iterable<Integer> {
 
   /**
    * Remove all entries from the list.
+   * 
+   * @webref floatlist:method
+   * @brief Remove all entries from the list
    */
   public void clear() {
     count = 0;
@@ -91,6 +99,9 @@ public class IntList implements Iterable<Integer> {
 
   /**
    * Get an entry at a particular index.
+   *
+   * @webref floatlist:method
+   * @brief Get an entry at a particular index
    */
   public int get(int index) {
     return data[index];
@@ -101,6 +112,9 @@ public class IntList implements Iterable<Integer> {
    * Set the entry at a particular index. If the index is past the length of
    * the list, it'll expand the list to accommodate, and fill the intermediate
    * entries with 0s.
+   *
+   * @webref floatlist:method
+   * @brief Set the entry at a particular index
    */
   public void set(int index, int what) {
     if (index >= count) {
@@ -114,7 +128,12 @@ public class IntList implements Iterable<Integer> {
   }
 
 
-  /** remove an element from the specified index */
+  /** 
+   * Remove an element from the specified index 
+   *
+   * @webref floatlist:method
+   * @brief Remove an element from the specified index
+   */
   public void remove(int index) {
 //    int[] outgoing = new int[count - 1];
 //    System.arraycopy(data, 0, outgoing, 0, index);
@@ -153,7 +172,12 @@ public class IntList implements Iterable<Integer> {
   }
 
 
-  /** Add a new entry to the list. */
+  /** 
+   * Add a new entry to the list.
+   *
+   * @webref floatlist:method
+   * @brief Add a new entry to the list 
+   */
   public void append(int value) {
     if (count == data.length) {
       data = PApplet.expand(data);
@@ -312,7 +336,10 @@ public class IntList implements Iterable<Integer> {
 //    }
 //  }
 
-
+  /**
+   * @webref floatlist:method
+   * @brief To come...
+   */
   public boolean hasValue(int value) {
 //    if (indexCache == null) {
 //      cacheIndices();
@@ -326,32 +353,50 @@ public class IntList implements Iterable<Integer> {
     return false;
   }
 
-
+  /**
+   * @webref floatlist:method
+   * @brief To come...
+   */
   public void increment(int index) {
     data[index]++;
   }
 
-
+  /**
+   * @webref floatlist:method
+   * @brief To come...
+   */
   public void add(int index, int amount) {
     data[index] += amount;
   }
 
-
+  /**
+   * @webref floatlist:method
+   * @brief To come...
+   */
   public void sub(int index, int amount) {
     data[index] -= amount;
   }
 
-
+  /**
+   * @webref floatlist:method
+   * @brief To come...
+   */
   public void mult(int index, int amount) {
     data[index] *= amount;
   }
 
-
+  /**
+   * @webref floatlist:method
+   * @brief To come...
+   */
   public void div(int index, int amount) {
     data[index] /= amount;
   }
 
-
+  /**
+   * @webref floatlist:method
+   * @brief To come...
+   */
   public int min() {
     if (count == 0) {
       throw new ArrayIndexOutOfBoundsException("Cannot use min() on IntList of length 0.");
@@ -363,7 +408,10 @@ public class IntList implements Iterable<Integer> {
     return outgoing;
   }
 
-
+  /**
+   * @webref floatlist:method
+   * @brief To come...
+   */
   public int max() {
     if (count == 0) {
       throw new ArrayIndexOutOfBoundsException("Cannot use max() on IntList of length 0.");
@@ -376,13 +424,23 @@ public class IntList implements Iterable<Integer> {
   }
 
 
-  /** Sorts the array in place. */
+  /** 
+   * Sorts the array in place. 
+   * 
+   * @webref floatlist:method
+   * @brief Sorts the array in place
+   */
   public void sort() {
     Arrays.sort(data, 0, count);
   }
 
 
-  /** reverse sort, orders values from highest to lowest */
+  /** 
+   * Reverse sort, orders values from highest to lowest. 
+   *
+   * @webref floatlist:method
+   * @brief Reverse sort, orders values from highest to lowest
+   */
   public void sortReverse() {
     new Sort() {
       @Override
@@ -422,7 +480,10 @@ public class IntList implements Iterable<Integer> {
 //    count = num;
 //  }
 
-
+  /** 
+   * @webref floatlist:method
+   * @brief To come...
+   */
   public void reverse() {
     int ii = count - 1;
     for (int i = 0; i < count/2; i++) {
@@ -437,6 +498,9 @@ public class IntList implements Iterable<Integer> {
   /**
    * Randomize the order of the list elements. Note that this does not
    * obey the randomSeed() function in PApplet.
+   *
+   * @webref floatlist:method
+   * @brief Randomize the order of the list elements
    */
   public void shuffle() {
     Random r = new Random();
@@ -508,7 +572,10 @@ public class IntList implements Iterable<Integer> {
 
   /**
    * Create a new array with a copy of all the values.
+   * 
    * @return an array sized by the length of the list with each of the values.
+   * @webref floatlist:method
+   * @brief Create a new array with a copy of all the values
    */
   public int[] array() {
     return array(null);
diff --git a/core/src/processing/data/JSONArray.java b/core/src/processing/data/JSONArray.java
index 349704599..2d74ef602 100644
--- a/core/src/processing/data/JSONArray.java
+++ b/core/src/processing/data/JSONArray.java
@@ -91,6 +91,7 @@ import processing.core.PApplet;
  *
  * @author JSON.org
  * @version 2012-11-13
+ * @webref data:composite
  */
 public class JSONArray {
 
@@ -258,6 +259,8 @@ public class JSONArray {
    * @param index The index must be between 0 and length() - 1.
    * @return      A string value.
    * @throws JSONException If there is no string value for the index.
+   * @webref jsonarray:method
+   * @brief Get the string associated with an index
    */
   public String getString(int index) {
     Object object = this.get(index);
@@ -274,6 +277,8 @@ public class JSONArray {
    * @param index The index must be between 0 and length() - 1.
    * @return      The value.
    * @throws   JSONException If the key is not found or if the value is not a number.
+   * @webref jsonarray:method
+   * @brief Get the int value associated with an index
    */
   public int getInt(int index) {
     Object object = this.get(index);
@@ -310,6 +315,9 @@ public class JSONArray {
   /**
    * Get a value from an index as a float. JSON uses 'double' values
    * internally, so this is simply getDouble() cast to a float.
+   * 
+   * @webref jsonarray:method
+   * @brief To come...
    */
   public float getFloat(int index) {
     return (float) getDouble(index);
@@ -344,6 +352,8 @@ public class JSONArray {
    * @return      The truth.
    * @throws JSONException If there is no value for the index or if the
    *  value is not convertible to boolean.
+   * @webref jsonarray:method
+   * @brief Get the boolean value associated with an index
    */
   public boolean getBoolean(int index) {
     Object object = this.get(index);
@@ -362,10 +372,13 @@ public class JSONArray {
 
   /**
    * Get the JSONArray associated with an index.
+   * 
    * @param index The index must be between 0 and length() - 1.
    * @return      A JSONArray value.
    * @throws JSONException If there is no value for the index. or if the
    * value is not a JSONArray
+   * @webref jsonarray:method
+   * @brief Get the JSONArray associated with an index
    */
   public JSONArray getJSONArray(int index) {
     Object object = this.get(index);
@@ -378,10 +391,13 @@ public class JSONArray {
 
   /**
    * Get the JSONObject associated with an index.
+   * 
    * @param index subscript
    * @return      A JSONObject value.
    * @throws JSONException If there is no value for the index or if the
    * value is not a JSONObject
+   * @webref jsonarray:method
+   * @brief Get the JSONObject associated with an index
    */
   public JSONObject getJSONObject(int index) {
     Object object = this.get(index);
@@ -392,7 +408,12 @@ public class JSONArray {
   }
 
 
-  /** Get this entire array as a String array. */
+  /** 
+   * Get this entire array as a String array. 
+   * 
+   * @webref jsonarray:method
+   * @brief Get this entire array as a String array
+   */
   public String[] getStringArray() {
     String[] outgoing = new String[size()];
     for (int i = 0; i < size(); i++) {
@@ -402,7 +423,12 @@ public class JSONArray {
   }
 
 
-  /** Get this entire array as an int array. Everything must be an int. */
+  /** 
+   * Get this entire array as an int array. Everything must be an int. 
+   * 
+   * @webref jsonarray:method
+   * @brief Get this entire array as an int array
+   */
   public int[] getIntArray() {
     int[] outgoing = new int[size()];
     for (int i = 0; i < size(); i++) {
@@ -634,6 +660,8 @@ public class JSONArray {
    *
    * @param value A String value.
    * @return this.
+   * @webref jsonarray:method
+   * @brief Append an String value. This increases the array's length by one.
    */
   public JSONArray append(String value) {
     this.append((Object)value);
@@ -777,6 +805,8 @@ public class JSONArray {
    * @param value A String value.
    * @return this.
    * @throws JSONException If the index is negative.
+   * @webref jsonarray:method
+   * @brief Put or replace a String value
    */
   public JSONArray setString(int index, String value) {
     this.set(index, value);
@@ -792,6 +822,8 @@ public class JSONArray {
    * @param value An int value.
    * @return this.
    * @throws JSONException If the index is negative.
+   * @webref jsonarray:method
+   * @brief Put or replace an int value
    */
   public JSONArray setInt(int index, int value) {
     this.set(index, new Integer(value));
@@ -823,6 +855,8 @@ public class JSONArray {
    * @return this.
    * @throws RuntimeException If the index is negative or if the value is
    * not finite.
+   * @webref jsonarray:method
+   * @brief Put or replace a float value
    */
   public JSONArray setFloat(int index, float value) {
     return setDouble(index, value);
@@ -852,6 +886,8 @@ public class JSONArray {
    * @param value A boolean value.
    * @return this.
    * @throws JSONException If the index is negative.
+   * @webref jsonarray:method
+   * @brief Put or replace a boolean value
    */
   public JSONArray setBoolean(int index, boolean value) {
     return set(index, value ? Boolean.TRUE : Boolean.FALSE);
@@ -872,13 +908,19 @@ public class JSONArray {
 //    return this;
 //  }
 
-
+  /**
+   * @webref jsonarray:method
+   * @brief To come...
+   */
   public JSONArray setJSONArray(int index, JSONArray value) {
     set(index, value);
     return this;
   }
 
-
+  /**
+   * @webref jsonarray:method
+   * @brief To come...
+   */
   public JSONArray setJSONObject(int index, JSONObject value) {
     set(index, value);
     return this;
@@ -918,6 +960,8 @@ public class JSONArray {
    * Get the number of elements in the JSONArray, included nulls.
    *
    * @return The length (or size).
+   * @webref jsonarray:method
+   * @brief Get the number of elements in the JSONArray, included nulls
    */
   public int size() {
     return myArrayList.size();
@@ -937,9 +981,12 @@ public class JSONArray {
 
   /**
    * Remove an index and close the hole.
+   * 
    * @param index The index of the element to be removed.
    * @return The value that was associated with the index,
    * or null if there was no value.
+   * @webref jsonarray:method
+   * @brief Remove an index and close the hole
    */
   public Object remove(int index) {
     Object o = this.opt(index);
diff --git a/core/src/processing/data/JSONObject.java b/core/src/processing/data/JSONObject.java
index 02d18b77b..589066d8b 100644
--- a/core/src/processing/data/JSONObject.java
+++ b/core/src/processing/data/JSONObject.java
@@ -103,6 +103,7 @@ import processing.core.PApplet;
  *
  * @author JSON.org
  * @version 2012-12-01
+ * @webref data:composite
  */
 public class JSONObject {
   /**
@@ -539,6 +540,8 @@ public class JSONObject {
    * @param key   A key string.
    * @return      A string which is the value.
    * @throws   JSONException if there is no string value for the key.
+   * @webref jsonobject:method
+   * @brief Get the string associated with a key
    */
   public String getString(String key) {
     Object object = this.get(key);
@@ -556,6 +559,8 @@ public class JSONObject {
    * @return      The integer value.
    * @throws   JSONException if the key is not found or if the value cannot
    *  be converted to an integer.
+   * @webref jsonobject:method
+   * @brief Get the int value associated with a key
    */
   public int getInt(String key) {
     Object object = this.get(key);
@@ -588,7 +593,10 @@ public class JSONObject {
     }
   }
 
-
+  /**
+   * @webref jsonobject:method
+   * @brief To come...
+   */
   public float getFloat(String key) {
     return (float) getDouble(key);
   }
@@ -618,8 +626,9 @@ public class JSONObject {
    *
    * @param key   A key string.
    * @return      The truth.
-   * @throws      JSONException
-   *  if the value is not a Boolean or the String "true" or "false".
+   * @throws      JSONException if the value is not a Boolean or the String "true" or "false".
+   * @webref jsonobject:method
+   * @brief Get the boolean value associated with a key
    */
   public boolean getBoolean(String key) {
     Object object = this.get(key);
@@ -641,8 +650,9 @@ public class JSONObject {
    *
    * @param key   A key string.
    * @return      A JSONArray which is the value.
-   * @throws      JSONException if the key is not found or
-   *  if the value is not a JSONArray.
+   * @throws      JSONException if the key is not found or if the value is not a JSONArray.
+   * @webref jsonobject:method
+   * @brief Get the JSONArray value associated with a key
    */
   public JSONArray getJSONArray(String key) {
     Object object = this.get(key);
@@ -658,8 +668,9 @@ public class JSONObject {
    *
    * @param key   A key string.
    * @return      A JSONObject which is the value.
-   * @throws      JSONException if the key is not found or
-   *  if the value is not a JSONObject.
+   * @throws      JSONException if the key is not found or if the value is not a JSONObject.
+   * @webref jsonobject:method
+   * @brief Get the JSONObject value associated with a key
    */
   public JSONObject getJSONObject(String key) {
     Object object = this.get(key);
@@ -1082,6 +1093,10 @@ public class JSONObject {
   }
 
 
+  /**
+   * @webref jsonobject:method
+   * @brief To come...
+   */
   public JSONObject setString(String key, String value) {
     return put(key, value);
   }
@@ -1094,6 +1109,8 @@ public class JSONObject {
    * @param value An int which is the value.
    * @return this.
    * @throws JSONException If the key is null.
+   * @webref jsonobject:method
+   * @brief Put a key/int pair in the JSONObject
    */
   public JSONObject setInt(String key, int value) {
     this.put(key, new Integer(value));
@@ -1114,7 +1131,10 @@ public class JSONObject {
     return this;
   }
 
-
+  /**
+   * @webref jsonobject:method
+   * @brief To come...
+   */
   public JSONObject setFloat(String key, float value) {
     this.put(key, new Double(value));
     return this;
@@ -1142,18 +1162,26 @@ public class JSONObject {
    * @param value A boolean which is the value.
    * @return this.
    * @throws JSONException If the key is null.
+   * @webref jsonobject:method
+   * @brief Put a key/boolean pair in the JSONObject
    */
   public JSONObject setBoolean(String key, boolean value) {
     this.put(key, value ? Boolean.TRUE : Boolean.FALSE);
     return this;
   }
 
-
+  /**
+   * @webref jsonobject:method
+   * @brief To come...
+   */
   public JSONObject setJSONObject(String key, JSONObject value) {
     return put(key, value);
   }
 
-
+  /**
+   * @webref jsonobject:method
+   * @brief To come...
+   */
   public JSONObject setJSONArray(String key, JSONArray value) {
     return put(key, value);
   }
diff --git a/core/src/processing/data/StringDict.java b/core/src/processing/data/StringDict.java
index 93c3dce54..7a32db9fe 100644
--- a/core/src/processing/data/StringDict.java
+++ b/core/src/processing/data/StringDict.java
@@ -9,6 +9,8 @@ import processing.core.PApplet;
 
 /**
  * A simple table class to use a String as a lookup for another String value.
+ * 
+ * @webref data:composite
  */
 public class StringDict {
 
@@ -73,13 +75,21 @@ public class StringDict {
     }
   }
 
-
+  /**
+   * @webref stringdict:method
+   * @brief To come...
+   */
   public int size() {
     return count;
   }
 
 
-  /** Remove all entries. */
+  /** 
+   * Remove all entries. 
+   *
+   * @webref stringdict:method
+   * @brief Remove all entries
+   */
   public void clear() {
     count = 0;
     indices = new HashMap<String, Integer>();
@@ -108,7 +118,10 @@ public class StringDict {
 //    return keys;
 //  }
 
-
+  /**
+   * @webref stringdict:method
+   * @brief To come...
+   */
   public Iterable<String> keys() {
     return new Iterable<String>() {
 
@@ -136,6 +149,9 @@ public class StringDict {
 
   /**
    * Return a copy of the internal keys array. This array can be modified.
+   * 
+   * @webref stringdict:method
+   * @brief Return a copy of the internal keys array
    */
   public String[] keyArray() {
     return keyArray(null);
@@ -155,7 +171,10 @@ public class StringDict {
     return values[index];
   }
 
-
+  /**
+   * @webref stringdict:method
+   * @brief To come...
+   */
   public Iterable<String> values() {
     return new Iterable<String>() {
 
@@ -183,6 +202,9 @@ public class StringDict {
 
   /**
    * Create a new array and copy each of the values into it.
+   *
+   * @webref stringdict:method
+   * @brief Create a new array and copy each of the values into it
    */
   public int[] valueArray() {
     return valueArray(null);
@@ -205,6 +227,9 @@ public class StringDict {
 
   /**
    * Return a value for the specified key.
+   * 
+   * @webref stringdict:method
+   * @brief Return a value for the specified key
    */
   public String get(String key) {
     int index = index(key);
@@ -212,7 +237,10 @@ public class StringDict {
     return values[index];
   }
 
-
+  /**
+   * @webref stringdict:method
+   * @brief To come...
+   */
   public void set(String key, String amount) {
     int index = index(key);
     if (index == -1) {
@@ -228,7 +256,10 @@ public class StringDict {
     return (found == null) ? -1 : found.intValue();
   }
 
-
+  /**
+   * @webref stringdict:method
+   * @brief To come...
+   */
   public boolean hasKey(String key) {
     return index(key) != -1;
   }
@@ -245,7 +276,10 @@ public class StringDict {
     count++;
   }
 
-
+  /**
+   * @webref stringdict:method
+   * @brief To come...
+   */
   public void remove(String key) {
     removeIndex(index(key));
   }
@@ -281,12 +315,18 @@ public class StringDict {
   /**
    * Sort the keys alphabetically (ignoring case). Uses the value as a
    * tie-breaker (only really possible with a key that has a case change).
+   * 
+   * @webref stringdict:method
+   * @brief Sort the keys alphabetically
    */
   public void sortKeys() {
     sortImpl(true, false);
   }
 
-
+  /**
+   * @webref stringdict:method
+   * @brief To come...
+   */
   public void sortKeysReverse() {
     sortImpl(true, true);
   }
@@ -294,12 +334,19 @@ public class StringDict {
 
   /**
    * Sort by values in descending order (largest value will be at [0]).
+   *
+   * @webref stringdict:method
+   * @brief Sort by values in descending order
    */
   public void sortValues() {
     sortImpl(false, false);
   }
 
 
+  /**
+   * @webref stringdict:method
+   * @brief To come...
+   */
   public void sortValuesReverse() {
     sortImpl(false, true);
   }
diff --git a/core/src/processing/data/StringList.java b/core/src/processing/data/StringList.java
index 228ffc0f2..1a8c7561c 100644
--- a/core/src/processing/data/StringList.java
+++ b/core/src/processing/data/StringList.java
@@ -6,7 +6,9 @@ import java.util.Random;
 
 import processing.core.PApplet;
 
-
+/**
+ * @webref data:composite
+ */
 public class StringList implements Iterable<String> {
   int count;
   String[] data;
@@ -54,6 +56,9 @@ public class StringList implements Iterable<String> {
 
   /**
    * Get the length of the list.
+   *
+   * @webref stringlist:method
+   * @brief Get the length of the list
    */
   public int size() {
     return count;
@@ -75,6 +80,9 @@ public class StringList implements Iterable<String> {
 
   /**
    * Remove all entries from the list.
+   *
+   * @webref stringlist:method
+   * @brief Remove all entries from the list
    */
   public void clear() {
     count = 0;
@@ -83,6 +91,9 @@ public class StringList implements Iterable<String> {
 
   /**
    * Get an entry at a particular index.
+   *
+   * @webref stringlist:method
+   * @brief Get an entry at a particular index
    */
   public String get(int index) {
     return data[index];
@@ -93,6 +104,9 @@ public class StringList implements Iterable<String> {
    * Set the entry at a particular index. If the index is past the length of
    * the list, it'll expand the list to accommodate, and fill the intermediate
    * entries with 0s.
+   *
+   * @webref stringlist:method
+   * @brief Set an entry at a particular index
    */
   public void set(int index, String what) {
     if (index >= count) {
@@ -106,7 +120,12 @@ public class StringList implements Iterable<String> {
   }
 
 
-  /** remove an element from the specified index */
+  /** 
+   * Remove an element from the specified index. 
+   * 
+   * @webref stringlist:method
+   * @brief Remove an element from the specified index
+   */
   public void remove(int index) {
 //    int[] outgoing = new int[count - 1];
 //    System.arraycopy(data, 0, outgoing, 0, index);
@@ -203,7 +222,12 @@ public class StringList implements Iterable<String> {
   }
 
 
-  /** Add a new entry to the list. */
+  /** 
+   * Add a new entry to the list.  
+   * 
+   * @webref stringlist:method
+   * @brief Add a new entry to the list
+   */
   public void append(String value) {
     if (count == data.length) {
       data = PApplet.expand(data);
@@ -361,7 +385,10 @@ public class StringList implements Iterable<String> {
 //    }
 //  }
 
-
+  /**
+   * @webref stringlist:method
+   * @brief To come...
+   */
   public boolean hasValue(String value) {
     if (value == null) {
       for (int i = 0; i < count; i++) {
@@ -380,13 +407,23 @@ public class StringList implements Iterable<String> {
   }
 
 
-  /** Sorts the array in place. */
+  /** 
+   * Sorts the array in place. 
+   * 
+   * @webref stringlist:method
+   * @brief Sorts the array in place
+   */
   public void sort() {
     sortImpl(false);
   }
 
 
-  /** reverse sort, orders values from highest to lowest */
+  /** 
+   * Reverse sort, orders values from highest to lowest.
+   * 
+   * @webref stringlist:method
+   * @brief Reverse sort, orders values from highest to lowest 
+   */
   public void sortReverse() {
     sortImpl(true);
   }
@@ -432,7 +469,10 @@ public class StringList implements Iterable<String> {
 //    count = num;
 //  }
 
-
+  /**
+   * @webref stringlist:method
+   * @brief To come... 
+   */
   public void reverse() {
     int ii = count - 1;
     for (int i = 0; i < count/2; i++) {
@@ -447,6 +487,9 @@ public class StringList implements Iterable<String> {
   /**
    * Randomize the order of the list elements. Note that this does not
    * obey the randomSeed() function in PApplet.
+   * 
+   * @webref stringlist:method
+   * @brief Randomize the order of the list elements
    */
   public void shuffle() {
     Random r = new Random();
@@ -477,7 +520,12 @@ public class StringList implements Iterable<String> {
   }
 
 
-  /** Make the entire list lower case. */
+  /** 
+   * Make the entire list lower case. 
+   * 
+   * @webref stringlist:method
+   * @brief Make the entire list lower case
+   */
   public void lower() {
     for (int i = 0; i < count; i++) {
       if (data[i] != null) {
@@ -487,7 +535,12 @@ public class StringList implements Iterable<String> {
   }
 
 
-  /** Make the entire list upper case. */
+  /** 
+   * Make the entire list upper case. 
+   *
+   * @webref stringlist:method
+   * @brief Make the entire list upper case
+   */
   public void upper() {
     for (int i = 0; i < count; i++) {
       if (data[i] != null) {
@@ -542,7 +595,10 @@ public class StringList implements Iterable<String> {
 
   /**
    * Create a new array with a copy of all the values.
+   * 
    * @return an array sized by the length of the list with each of the values.
+   * @webref stringlist:method
+   * @brief Create a new array with a copy of all the values
    */
   public String[] array() {
     return array(null);
diff --git a/core/src/processing/data/Table.java b/core/src/processing/data/Table.java
index d6e9f9a1f..b84ad37cb 100644
--- a/core/src/processing/data/Table.java
+++ b/core/src/processing/data/Table.java
@@ -1294,12 +1294,14 @@ public class Table {
     }
   }
 
-
+ /**
+   * @webref table:method
+   * @brief Removes a column from the table
+   */
   public void removeColumn(String columnName) {
     removeColumn(getColumnIndex(columnName));
   }
 
-
   public void removeColumn(int column) {
     int newCount = columns.length - 1;
 
@@ -1331,7 +1333,10 @@ public class Table {
     }
   }
 
-
+  /**
+   * @webref table:method
+   * @brief To come...
+   */
   public int getColumnCount() {
     return columns.length;
   }
@@ -1655,7 +1660,10 @@ public class Table {
 
   // . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
 
-
+  /**
+   * @webref table:method
+   * @brief To come...
+   */
   public int getRowCount() {
     return rowCount;
   }
@@ -1665,7 +1673,10 @@ public class Table {
     return getRowCount() - 1;
   }
 
-
+  /**
+   * @webref table:method
+   * @brief Removes all rows from a table
+   */
   public void clearRows() {
     setRowCount(0);
   }
@@ -1702,7 +1713,10 @@ public class Table {
     rowCount = newCount;
   }
 
-
+  /**
+   * @webref table:method
+   * @brief Adds a row to the table
+   */
   public TableRow addRow() {
     setRowCount(rowCount + 1);
     return new RowPointer(this, rowCount - 1);
@@ -1791,7 +1805,10 @@ public class Table {
     rowCount++;
   }
 
-
+  /**
+   * @webref table:method
+   * @brief Removes a row from the table
+   */
   public void removeRow(int row) {
     for (int col = 0; col < columns.length; col++) {
       switch (columnTypes[col]) {
@@ -1986,7 +2003,10 @@ public class Table {
 
   // . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
 
-
+  /**
+   * @webref table:method
+   * @brief Gets a row from the table
+   */
   public TableRow getRow(int row) {
     return new RowPointer(this, row);
   }
@@ -1996,6 +2016,9 @@ public class Table {
    * Note that this one iterator instance is shared by any calls to iterate
    * the rows of this table. This is very efficient, but not thread-safe.
    * If you want to iterate in a multi-threaded manner, don't use the iterator.
+   * 
+   * @webref table:method
+   * @brief To come...
    */
   public Iterable<TableRow> rows() {
     return new Iterable<TableRow>() {
@@ -2751,7 +2774,10 @@ public class Table {
     setString(row, column, value);
   }
 
-
+  /**
+   * @webref table:method
+   * @brief To come...
+   */
   public String[] getStringColumn(String name) {
     int col = getColumnIndex(name);
     return (col == -1) ? null : getStringColumn(col);
@@ -2880,7 +2906,10 @@ public class Table {
 
   // . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
 
-
+  /**
+   * @webref table:method
+   * @brief To come...
+   */
   public TableRow findRow(String value, int column) {
     int row = findRowIndex(value, column);
     return (row == -1) ? null : new RowPointer(this, row);
@@ -2891,7 +2920,10 @@ public class Table {
     return findRow(value, getColumnIndex(columnName));
   }
 
-
+  /**
+   * @webref table:method
+   * @brief To come...
+   */
   public Iterator<TableRow> findRows(String value, int column) {
     return new RowIndexIterator(this, findRowIndices(value, column));
   }
@@ -2988,7 +3020,10 @@ public class Table {
 
   // . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
 
-
+  /**
+   * @webref table:method
+   * @brief To come...
+   */
   public TableRow matchRow(String regexp, int column) {
     int row = matchRowIndex(regexp, column);
     return (row == -1) ? null : new RowPointer(this, row);
@@ -2999,7 +3034,10 @@ public class Table {
     return matchRow(regexp, getColumnIndex(columnName));
   }
 
-
+  /**
+   * @webref table:method
+   * @brief To come...
+   */
   public Iterator<TableRow> matchRows(String value, int column) {
     return new RowIndexIterator(this, matchRowIndices(value, column));
   }
@@ -3085,6 +3123,9 @@ public class Table {
 
   /**
    * Remove any of the specified characters from the entire table.
+   * 
+   * @webref table:method
+   * @brief Remove characters from the entire table
    */
   public void removeTokens(String tokens) {
     for (int col = 0; col < getColumnCount(); col++) {
@@ -3129,7 +3170,10 @@ public class Table {
 
   // . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
 
-
+  /**
+   * @webref table:method
+   * @brief To come...
+   */
   public void trim() {
     for (int col = 0; col < getColumnCount(); col++) {
       trim(col);
diff --git a/core/src/processing/data/TableRow.java b/core/src/processing/data/TableRow.java
index 82b191a8e..d5b65cee3 100644
--- a/core/src/processing/data/TableRow.java
+++ b/core/src/processing/data/TableRow.java
@@ -1,26 +1,61 @@
 package processing.data;
 
-
+/**
+ * @webref data:composite
+ */
 public interface TableRow {
+
+  /**
+   * @webref tablerow:method
+   * @brief Get the String value from a column
+   */
   public String getString(int column);
   public String getString(String columnName);
+
+  /**
+   * @webref tablerow:method
+   * @brief Get the int value from a column
+   */
   public int getInt(int column);
   public int getInt(String columnName);
+  
   public long getLong(int column);
   public long getLong(String columnName);
+
+  /**
+   * @webref tablerow:method
+   * @brief Get the float value from a column
+   */
   public float getFloat(int column);
   public float getFloat(String columnName);
+  
   public double getDouble(int column);
   public double getDouble(String columnName);
 
+  /**
+   * @webref tablerow:method
+   * @brief Set the String value in a column
+   */
   public void setString(int column, String value);
   public void setString(String columnName, String value);
+
+  /**
+   * @webref tablerow:method
+   * @brief Set the int value in a column
+   */
   public void setInt(int column, int value);
   public void setInt(String columnName, int value);
+
   public void setLong(int column, long value);
   public void setLong(String columnName, long value);
+
+  /**
+   * @webref tablerow:method
+   * @brief Set the float value in a column
+   */
   public void setFloat(int column, float value);
   public void setFloat(String columnName, float value);
+
   public void setDouble(int column, double value);
   public void setDouble(String columnName, double value);
 
diff --git a/java/keywords.txt b/java/keywords.txt
index 4cf38720c..450f7865a 100644
--- a/java/keywords.txt
+++ b/java/keywords.txt
@@ -413,9 +413,7 @@ createInput	FUNCTION1	createInput_
 createOutput	FUNCTION1	createOutput_
 createReader	FUNCTION1	createReader_
 createShape	FUNCTION1	createShape_
-loadTable	FUNCTION1	createTable_
 createWriter	FUNCTION1	createWriter_
-createXML	FUNCTION1	createXML_
 cursor	FUNCTION1	cursor_
 curve	FUNCTION1	curve_
 curveDetail	FUNCTION1	curveDetail_
@@ -443,6 +441,44 @@ exp	FUNCTION1	exp_
 expand	FUNCTION1	expand_
 fill	FUNCTION1	fill_
 filter	FUNCTION1	filter_
+FloatDict	KEYWORD5	FloatDict
+add	FUNCTION2	FloatDict_add_
+clear	FUNCTION2	FloatDict_clear_
+div	FUNCTION2	FloatDict_div_
+get	FUNCTION2	FloatDict_get_
+hasKey	FUNCTION2	FloatDict_hasKey_
+keyArray	FUNCTION2	FloatDict_keyArray_
+keys	FUNCTION2	FloatDict_keys_
+mult	FUNCTION2	FloatDict_mult_
+remove	FUNCTION2	FloatDict_remove_
+set	FUNCTION2	FloatDict_set_
+size	FUNCTION2	FloatDict_size_
+sortKeys	FUNCTION2	FloatDict_sortKeys_
+sortKeysReverse	FUNCTION2	FloatDict_sortKeysReverse_
+sortValues	FUNCTION2	FloatDict_sortValues_
+sortValuesReverse	FUNCTION2	FloatDict_sortValuesReverse_
+sub	FUNCTION2	FloatDict_sub_
+valueArray	FUNCTION2	FloatDict_valueArray_
+values	FUNCTION2	FloatDict_values_
+FloatList	KEYWORD5	FloatList
+add	FUNCTION2	FloatList_add_
+append	FUNCTION2	FloatList_append_
+array	FUNCTION2	FloatList_array_
+clear	FUNCTION2	FloatList_clear_
+div	FUNCTION2	FloatList_div_
+get	FUNCTION2	FloatList_get_
+hasValue	FUNCTION2	FloatList_hasValue_
+max	FUNCTION2	FloatList_max_
+min	FUNCTION2	FloatList_min_
+mult	FUNCTION2	FloatList_mult_
+remove	FUNCTION2	FloatList_remove_
+reverse	FUNCTION2	FloatList_reverse_
+set	FUNCTION2	FloatList_set_
+shuffle	FUNCTION2	FloatList_shuffle_
+size	FUNCTION2	FloatList_size_
+sort	FUNCTION2	FloatList_sort_
+sortReverse	FUNCTION2	FloatList_sortReverse_
+sub	FUNCTION2	FloatList_sub_
 floor	FUNCTION1	floor_
 focused	KEYWORD4	focused
 frameCount	KEYWORD4	frameCount
@@ -458,7 +494,78 @@ hour	FUNCTION1	hour_
 hue	FUNCTION1	hue_
 image	FUNCTION1	image_
 imageMode	FUNCTION1	imageMode_
+IntDict	KEYWORD5	IntDict
+add	FUNCTION2	IntDict_add_
+clear	FUNCTION2	IntDict_clear_
+div	FUNCTION2	IntDict_div_
+get	FUNCTION2	IntDict_get_
+hasKey	FUNCTION2	IntDict_hasKey_
+increment	FUNCTION2	IntDict_increment_
+keyArray	FUNCTION2	IntDict_keyArray_
+keys	FUNCTION2	IntDict_keys_
+mult	FUNCTION2	IntDict_mult_
+remove	FUNCTION2	IntDict_remove_
+set	FUNCTION2	IntDict_set_
+size	FUNCTION2	IntDict_size_
+sortKeys	FUNCTION2	IntDict_sortKeys_
+sortKeysReverse	FUNCTION2	IntDict_sortKeysReverse_
+sortValues	FUNCTION2	IntDict_sortValues_
+sortValuesReverse	FUNCTION2	IntDict_sortValuesReverse_
+sub	FUNCTION2	IntDict_sub_
+valueArray	FUNCTION2	IntDict_valueArray_
+values	FUNCTION2	IntDict_values_
+IntList	KEYWORD5	IntList
+add	FUNCTION2	IntList_add_
+append	FUNCTION2	IntList_append_
+array	FUNCTION2	IntList_array_
+clear	FUNCTION2	IntList_clear_
+div	FUNCTION2	IntList_div_
+get	FUNCTION2	IntList_get_
+hasValue	FUNCTION2	IntList_hasValue_
+increment	FUNCTION2	IntList_increment_
+max	FUNCTION2	IntList_max_
+min	FUNCTION2	IntList_min_
+mult	FUNCTION2	IntList_mult_
+remove	FUNCTION2	IntList_remove_
+reverse	FUNCTION2	IntList_reverse_
+set	FUNCTION2	IntList_set_
+shuffle	FUNCTION2	IntList_shuffle_
+size	FUNCTION2	IntList_size_
+sort	FUNCTION2	IntList_sort_
+sortReverse	FUNCTION2	IntList_sortReverse_
+sub	FUNCTION2	IntList_sub_
 join	FUNCTION1	join_
+JSONArray	KEYWORD5	JSONArray
+append	FUNCTION2	JSONArray_append_
+getBoolean	FUNCTION2	JSONArray_getBoolean_
+getFloat	FUNCTION2	JSONArray_getFloat_
+getInt	FUNCTION2	JSONArray_getInt_
+getIntArray	FUNCTION2	JSONArray_getIntArray_
+getJSONArray	FUNCTION2	JSONArray_getJSONArray_
+getJSONObject	FUNCTION2	JSONArray_getJSONObject_
+getString	FUNCTION2	JSONArray_getString_
+getStringArray	FUNCTION2	JSONArray_getStringArray_
+remove	FUNCTION2	JSONArray_remove_
+setBoolean	FUNCTION2	JSONArray_setBoolean_
+setFloat	FUNCTION2	JSONArray_setFloat_
+setInt	FUNCTION2	JSONArray_setInt_
+getJSONArray	FUNCTION2	JSONArray_setJSONArray_
+getJSONObject	FUNCTION2	JSONArray_setJSONObject_
+setString	FUNCTION2	JSONArray_setString_
+size	FUNCTION2	JSONArray_size_
+JSONObject	KEYWORD5	JSONObject
+getBoolean	FUNCTION2	JSONObject_getBoolean_
+getFloat	FUNCTION2	JSONObject_getFloat_
+getInt	FUNCTION2	JSONObject_getInt_
+getJSONArray	FUNCTION2	JSONObject_getJSONArray_
+getJSONObject	FUNCTION2	JSONObject_getJSONObject_
+getString	FUNCTION2	JSONObject_getString_
+setBoolean	FUNCTION2	JSONObject_setBoolean_
+setFloat	FUNCTION2	JSONObject_setFloat_
+setInt	FUNCTION2	JSONObject_setInt_
+getJSONArray	FUNCTION2	JSONObject_setJSONArray_
+getJSONObject	FUNCTION2	JSONObject_setJSONObject_
+setString	FUNCTION2	JSONObject_setString_
 key	KEYWORD4	key
 keyCode	KEYWORD4	keyCode
 keyPressed	FUNCTION4	keyPressed
@@ -474,6 +581,8 @@ line	FUNCTION1	line_
 loadBytes	FUNCTION1	loadBytes_
 loadFont	FUNCTION1	loadFont_
 loadImage	FUNCTION1	loadImage_
+loadJSONArray	FUNCTION1	loadJSONArray_
+loadJSONObject	FUNCTION1	loadJSONObject_
 loadPixels	FUNCTION1	loadPixels_
 loadShader	FUNCTION1	loadShader_
 loadShape	FUNCTION1	loadShape_
@@ -586,7 +695,6 @@ array	FUNCTION2	PVector_array_
 copy	FUNCTION2	PVector_copy_
 cross	FUNCTION2	PVector_cross_
 dist	FUNCTION2	PVector_dist_
-div	FUNCTION2	PVector_div_
 dot	FUNCTION2	PVector_dot_
 fromAngle	FUNCTION2	PVector_fromAngle_
 get	FUNCTION2	PVector_get_
@@ -595,7 +703,6 @@ lerp	FUNCTION2	PVector_lerp_
 limit	FUNCTION2	PVector_limit_
 mag	FUNCTION2	PVector_mag_
 magSq	FUNCTION2	PVector_magSq_
-mult	FUNCTION2	PVector_mult_
 normalize	FUNCTION2	PVector_normalize_
 random2D	FUNCTION2	PVector_random2D_
 random3D	FUNCTION2	PVector_random3D_
@@ -627,6 +734,8 @@ saturation	FUNCTION1	saturation_
 save	FUNCTION1	save_
 saveBytes	FUNCTION1	saveBytes_
 saveFrame	FUNCTION1	saveFrame_
+saveJSONArray	FUNCTION1	saveJSONArray_
+saveJSONObject	FUNCTION1	saveJSONObject_
 saveStream	FUNCTION1	saveStream_
 saveStrings	FUNCTION1	saveStrings_
 loadTable	FUNCTION1	saveTable_
@@ -661,12 +770,65 @@ splitTokens	FUNCTION1	splitTokens_
 spotLight	FUNCTION1	spotLight_
 sq	FUNCTION1	sq_
 sqrt	FUNCTION1	sqrt_
+StringDict	KEYWORD5	StringDict
+clear	FUNCTION2	StringDict_clear_
+get	FUNCTION2	StringDict_get_
+hasKey	FUNCTION2	StringDict_hasKey_
+keyArray	FUNCTION2	StringDict_keyArray_
+keys	FUNCTION2	StringDict_keys_
+remove	FUNCTION2	StringDict_remove_
+set	FUNCTION2	StringDict_set_
+size	FUNCTION2	StringDict_size_
+sortKeys	FUNCTION2	StringDict_sortKeys_
+sortKeysReverse	FUNCTION2	StringDict_sortKeysReverse_
+sortValues	FUNCTION2	StringDict_sortValues_
+sortValuesReverse	FUNCTION2	StringDict_sortValuesReverse_
+valueArray	FUNCTION2	StringDict_valueArray_
+values	FUNCTION2	StringDict_values_
+StringList	KEYWORD5	StringList
+append	FUNCTION2	StringList_append_
+array	FUNCTION2	StringList_array_
+clear	FUNCTION2	StringList_clear_
+get	FUNCTION2	StringList_get_
+hasValue	FUNCTION2	StringList_hasValue_
+lower	FUNCTION2	StringList_lower_
+remove	FUNCTION2	StringList_remove_
+reverse	FUNCTION2	StringList_reverse_
+set	FUNCTION2	StringList_set_
+shuffle	FUNCTION2	StringList_shuffle_
+size	FUNCTION2	StringList_size_
+sort	FUNCTION2	StringList_sort_
+sortReverse	FUNCTION2	StringList_sortReverse_
+upper	FUNCTION2	StringList_upper_
 stroke	FUNCTION1	stroke_
 strokeCap	FUNCTION1	strokeCap_
 strokeJoin	FUNCTION1	strokeJoin_
 strokeWeight	FUNCTION1	strokeWeight_
 subset	FUNCTION1	subset_
 Table	KEYWORD5	Table
+addColumn	FUNCTION2	Table_addColumn_
+addRow	FUNCTION2	Table_addRow_
+clearRows	FUNCTION2	Table_clearRows_
+findRow	FUNCTION2	Table_findRow_
+findRows	FUNCTION2	Table_findRows_
+getColumnCount	FUNCTION2	Table_getColumnCount_
+getRow	FUNCTION2	Table_getRow_
+getRowCount	FUNCTION2	Table_getRowCount_
+getStringColumn	FUNCTION2	Table_getStringColumn_
+matchRow	FUNCTION2	Table_matchRow_
+matchRows	FUNCTION2	Table_matchRows_
+removeColumn	FUNCTION2	Table_removeColumn_
+removeRow	FUNCTION2	Table_removeRow_
+removeTokens	FUNCTION2	Table_removeTokens_
+rows	FUNCTION2	Table_rows_
+trim	FUNCTION2	Table_trim_
+TableRow	KEYWORD5	TableRow
+getFloat	FUNCTION2	TableRow_getFloat_
+getFloat	FUNCTION2	TableRow_getInt_
+getString	FUNCTION2	TableRow_getString_
+setFloat	FUNCTION2	TableRow_setFloat_
+setInt	FUNCTION2	TableRow_setInt_
+setString	FUNCTION2	TableRow_setString_
 tan	FUNCTION1	tan_
 TAU	LITERAL2	TAU
 text	FUNCTION1	text_