diff --git a/core/src/processing/core/PApplet.java b/core/src/processing/core/PApplet.java
index 9523c3b2b..169032d29 100755
--- a/core/src/processing/core/PApplet.java
+++ b/core/src/processing/core/PApplet.java
@@ -6261,7 +6261,7 @@ public class PApplet extends Applet
   public Table loadTable(String filename, String options) {
     try {
       String optionStr = Table.extensionOptions(true, filename, options);
-      String[] optionList = split(optionStr, ',');
+      String[] optionList = trim(split(optionStr, ','));
 
       Table dictionary = null;
       for (String opt : optionList) {
@@ -10640,7 +10640,7 @@ public class PApplet extends Applet
     } else {  // if not presenting
       // can't do pack earlier cuz present mode don't like it
       // (can't go full screen with a frame after calling pack)
-      //        frame.pack();  
+      //        frame.pack();
 
       // get insets. get more.
       Insets insets = frame.getInsets();
diff --git a/core/src/processing/data/Table.java b/core/src/processing/data/Table.java
index 2a3c4f857..e942df017 100644
--- a/core/src/processing/data/Table.java
+++ b/core/src/processing/data/Table.java
@@ -306,7 +306,7 @@ public class Table {
 
     String[] opts = null;
     if (options != null) {
-      opts = PApplet.splitTokens(options, " ,");
+      opts = PApplet.trim(PApplet.split(options, ','));
       for (String opt : opts) {
         if (opt.equals("tsv")) {
           extension = "tsv";
@@ -915,7 +915,7 @@ public class Table {
       throw new IllegalArgumentException("No extension specified for saving this Table");
     }
 
-    String[] opts = PApplet.splitTokens(options, ", ");
+    String[] opts = PApplet.trim(PApplet.split(options, ','));
     // Only option for save is the extension, so we can safely grab the last
     extension = opts[opts.length - 1];
     boolean found = false;
diff --git a/core/todo.txt b/core/todo.txt
index 6960e6c68..1e8256b65 100644
--- a/core/todo.txt
+++ b/core/todo.txt
@@ -1,6 +1,20 @@
 0221 core
+X performance issue with shadertoy examples
+X   https://github.com/processing/processing/issues/1714
+X fix options parsing to handle spaces in the names
 
 
+video
+X problem with bit shifting
+X   https://github.com/processing/processing/pull/2023
+X   https://github.com/processing/processing/pull/2022
+X   https://github.com/processing/processing/issues/2021
+
+
+critical
+_ blendMode() change causes OpenGL renderer to be very slow
+_   https://github.com/processing/processing/issues/2021
+
 high
 _ blendMode(ADD) is broken with default renderer
 _   https://github.com/processing/processing/issues/2012
diff --git a/todo.txt b/todo.txt
index 020ceff77..808214745 100644
--- a/todo.txt
+++ b/todo.txt
@@ -1,5 +1,7 @@
 0221 pde
-
+X add double quotes to readlink call, fixes issue w/ paths and spaces
+X   https://github.com/processing/processing/pull/2027
+X   fix submitted by hamoid
 
 high
 _ MovieMaker needs to be compiling as 1.6