diff --git a/core/src/processing/core/PApplet.java b/core/src/processing/core/PApplet.java
index 9931644f4..d9759312c 100644
--- a/core/src/processing/core/PApplet.java
+++ b/core/src/processing/core/PApplet.java
@@ -10799,21 +10799,31 @@ public class PApplet extends Applet
   /**
    * @webref shape
    */
-  public PShape createShape(PShape source) {
-    return g.createShape(source);
-  }
-
-
   public PShape createShape() {
     return g.createShape();
   }
 
 
+  /**
+   * @param source
+   */
+  public PShape createShape(PShape source) {
+    return g.createShape(source);
+  }
+
+
+  /**
+   * @param type either POINTS, LINES, TRIANGLES, TRIANGLE_FAN, TRIANGLE_STRIP, QUADS, QUAD_STRIP
+   */
   public PShape createShape(int type) {
     return g.createShape(type);
   }
 
 
+  /**
+   * @param kind either LINE, TRIANGLE, RECT, ELLIPSE, ARC, SPHERE, BOX
+   * @param p parameters that match the kind of shape 
+   */
   public PShape createShape(int kind, float... p) {
     return g.createShape(kind, p);
   }
@@ -12000,7 +12010,7 @@ public class PApplet extends Applet
    * @param alignY vertical alignment, either TOP, BOTTOM, CENTER, or BASELINE
    * @see PApplet#loadFont(String)
    * @see PFont
-   * @see PGraphics#text(String, float, float, float, float, float)
+   * @see PGraphics#text(String, float, float)
    */
   public void textAlign(int alignX, int alignY) {
     if (recorder != null) recorder.textAlign(alignX, alignY);
@@ -12070,7 +12080,7 @@ public class PApplet extends Applet
    * @see PApplet#createFont(String, float, boolean)
    * @see PApplet#loadFont(String)
    * @see PFont#PFont
-   * @see PGraphics#text(String, float, float, float, float, float)
+   * @see PGraphics#text(String, float, float)
    */
   public void textFont(PFont which) {
     if (recorder != null) recorder.textFont(which);
@@ -12099,7 +12109,7 @@ public class PApplet extends Applet
    * @param leading the size in pixels for spacing between lines
    * @see PApplet#loadFont(String)
    * @see PFont#PFont
-   * @see PGraphics#text(String, float, float, float, float, float)
+   * @see PGraphics#text(String, float, float)
    * @see PGraphics#textFont(PFont)
    */
   public void textLeading(float leading) {
@@ -12135,7 +12145,7 @@ public class PApplet extends Applet
    * @param mode either MODEL or SHAPE
    * @see PApplet#loadFont(String)
    * @see PFont#PFont
-   * @see PGraphics#text(String, float, float, float, float, float)
+   * @see PGraphics#text(String, float, float)
    * @see PGraphics#textFont(PFont)
    * @see PGraphics#beginRaw(PGraphics)
    * @see PApplet#createFont(String, float, boolean)
@@ -12158,7 +12168,7 @@ public class PApplet extends Applet
    * @param size the size of the letters in units of pixels
    * @see PApplet#loadFont(String)
    * @see PFont#PFont
-   * @see PGraphics#text(String, float, float, float, float, float)
+   * @see PGraphics#text(String, float, float)
    * @see PGraphics#textFont(PFont)
    */
   public void textSize(float size) {
@@ -12186,7 +12196,7 @@ public class PApplet extends Applet
    * @param str the String of characters to measure
    * @see PApplet#loadFont(String)
    * @see PFont#PFont
-   * @see PGraphics#text(String, float, float, float, float, float)
+   * @see PGraphics#text(String, float, float)
    * @see PGraphics#textFont(PFont)
    */
   public float textWidth(String str) {
diff --git a/core/src/processing/core/PFont.java b/core/src/processing/core/PFont.java
index c1044bea2..4f776d6de 100644
--- a/core/src/processing/core/PFont.java
+++ b/core/src/processing/core/PFont.java
@@ -185,7 +185,7 @@ public class PFont implements PConstants {
    * @param smooth
    * @see PApplet#loadFont(String)
    * @see PGraphics#textFont(PFont, float)
-   * @see PGraphics#text(String, float, float, float, float, float)
+   * @see PGraphics#text(String, float, float)
    */
   public PFont(Font font, boolean smooth) {
     this(font, smooth, null);
diff --git a/core/src/processing/core/PGraphics.java b/core/src/processing/core/PGraphics.java
index fe59d2c9b..9d394cefc 100644
--- a/core/src/processing/core/PGraphics.java
+++ b/core/src/processing/core/PGraphics.java
@@ -1634,24 +1634,31 @@ public class PGraphics extends PImage implements PConstants {
   /**
    * @webref shape
    */
+  public PShape createShape() {
+    showMissingWarning("createShape");
+    return null;
+  }
+  
+  /**
+   * @param source
+   */
   public PShape createShape(PShape source) {
     showMissingWarning("createShape");
     return null;
   }
 
-
-  public PShape createShape() {
-    showMissingWarning("createShape");
-    return null;
-  }
-
-
+  /**
+   * @param type either POINTS, LINES, TRIANGLES, TRIANGLE_FAN, TRIANGLE_STRIP, QUADS, QUAD_STRIP
+   */
   public PShape createShape(int type) {
     showMissingWarning("createShape");
     return null;
   }
 
-
+  /**
+   * @param kind either LINE, TRIANGLE, RECT, ELLIPSE, ARC, SPHERE, BOX
+   * @param p parameters that match the kind of shape 
+   */
   public PShape createShape(int kind, float... p) {
     showMissingWarning("createShape");
     return null;
@@ -3769,7 +3776,7 @@ public class PGraphics extends PImage implements PConstants {
    * @param alignY vertical alignment, either TOP, BOTTOM, CENTER, or BASELINE
    * @see PApplet#loadFont(String)
    * @see PFont
-   * @see PGraphics#text(String, float, float, float, float, float)
+   * @see PGraphics#text(String, float, float)
    */
   public void textAlign(int alignX, int alignY) {
     textAlign = alignX;
@@ -3845,7 +3852,7 @@ public class PGraphics extends PImage implements PConstants {
    * @see PApplet#createFont(String, float, boolean)
    * @see PApplet#loadFont(String)
    * @see PFont#PFont
-   * @see PGraphics#text(String, float, float, float, float, float)
+   * @see PGraphics#text(String, float, float)
    */
   public void textFont(PFont which) {
     if (which != null) {
@@ -3907,7 +3914,7 @@ public class PGraphics extends PImage implements PConstants {
    * @param leading the size in pixels for spacing between lines
    * @see PApplet#loadFont(String)
    * @see PFont#PFont
-   * @see PGraphics#text(String, float, float, float, float, float)
+   * @see PGraphics#text(String, float, float)
    * @see PGraphics#textFont(PFont)
    */
   public void textLeading(float leading) {
@@ -3942,7 +3949,7 @@ public class PGraphics extends PImage implements PConstants {
    * @param mode either MODEL or SHAPE
    * @see PApplet#loadFont(String)
    * @see PFont#PFont
-   * @see PGraphics#text(String, float, float, float, float, float)
+   * @see PGraphics#text(String, float, float)
    * @see PGraphics#textFont(PFont)
    * @see PGraphics#beginRaw(PGraphics)
    * @see PApplet#createFont(String, float, boolean)
@@ -3987,7 +3994,7 @@ public class PGraphics extends PImage implements PConstants {
    * @param size the size of the letters in units of pixels
    * @see PApplet#loadFont(String)
    * @see PFont#PFont
-   * @see PGraphics#text(String, float, float, float, float, float)
+   * @see PGraphics#text(String, float, float)
    * @see PGraphics#textFont(PFont)
    */
   public void textSize(float size) {
@@ -4022,7 +4029,7 @@ public class PGraphics extends PImage implements PConstants {
    * @param str the String of characters to measure
    * @see PApplet#loadFont(String)
    * @see PFont#PFont
-   * @see PGraphics#text(String, float, float, float, float, float)
+   * @see PGraphics#text(String, float, float)
    * @see PGraphics#textFont(PFont)
    */
   public float textWidth(String str) {
diff --git a/core/src/processing/core/PShape.java b/core/src/processing/core/PShape.java
index 6ab0c2095..757be3e59 100644
--- a/core/src/processing/core/PShape.java
+++ b/core/src/processing/core/PShape.java
@@ -476,12 +476,14 @@ public class PShape implements PConstants {
 
   /**
    * @webref pshape:method 
+   * @brief Starts a new contour
    */
   public void beginContour() {
   }
   
   /**
    * @webref pshape:method 
+   * @brief Ends a contour
    */
   public void endContour() {
   }
@@ -502,7 +504,8 @@ public class PShape implements PConstants {
   }
 
   /**
-   * @webref pshape:method 
+   * @webref pshape:method
+   * @brief Finishes the creation of a new PShape 
    */
   public void end() {
   }
@@ -1292,7 +1295,8 @@ public class PShape implements PConstants {
 
   // can't be just 'add' because that suggests additive geometry
   /**
-   * @webref pshape:method 
+   * @webref pshape:method
+   * @brief Adds a new child  
    */
   public void addChild(PShape who) {
     if (children == null) {
@@ -1473,7 +1477,9 @@ public class PShape implements PConstants {
     return getVertex(index, null);
   }
 
-
+  /**
+   * @param vec PVector to assign the data to
+   */
   public PVector getVertex(int index, PVector vec) {
     if (vec == null) {
       vec = new PVector();
@@ -1501,8 +1507,10 @@ public class PShape implements PConstants {
 
   /**
    * @webref pshape:method 
-   * @brief sets the vertex at the index position
+   * @brief Sets the vertex at the index position
    * @param index the location of the vertex
+   * @param x the x value for the vertex
+   * @param y the y value for the vertex
    */
   public void setVertex(int index, float x, float y) {
     vertices[index][X] = x;
diff --git a/core/src/processing/data/Table.java b/core/src/processing/data/Table.java
index b921b9b5f..7d09f4747 100644
--- a/core/src/processing/data/Table.java
+++ b/core/src/processing/data/Table.java
@@ -2259,7 +2259,7 @@ public class Table {
    * Get a String value from the table. If the row is longer than the table
    * @param row
    * @param col
-   * @return
+   * @return the String defined by the row and col variables
    */
   public String getString(int row, int col) {
     checkBounds(row, col);