diff --git a/db/cv/okennedy.json b/db/cv/okennedy.json
index 8a49065d..5cc49156 100644
--- a/db/cv/okennedy.json
+++ b/db/cv/okennedy.json
@@ -172,79 +172,6 @@
       }
     ]
   },
-  "courses" : [
-    { "venue" : "Department of Computer Science and Engineering, SUNY Buffalo",
-      "courses" : [
-        { "code" : "CSE 562", 
-          "title" : "Graduate Database Systems (planned)", 
-          "semester" : "Spring 2017" },
-        { "code" : "CSE 199", 
-          "title" : "Undergraduate CS Seminar (Recitation)", 
-          "semester" : "Fall 2016" },
-        { "code" : "CSE 705", 
-          "title" : "Database Research Seminar", 
-          "semester" : "Fall 2016" },
-        { "code" : "CSE 662", 
-          "title" : "Languages and Runtimes for Big Data", 
-          "semester" : "Fall 2016" },
-        { "code" : "CSE 462", 
-          "title" : "Undergraduate Database Systems", 
-          "semester" : "Spring 2016" },
-        { "code" : "CSE 662", 
-          "title" : "Languages and Runtimes for Big Data", 
-          "semester" : "Fall 2015",
-          "enrollment" : 29 },
-        { "code" : "CSE 562", 
-          "title" : "Graduate Database Systems", 
-          "semester" : "Spring 2015",
-          "enrollment": 79 },
-        { "code" : "CSE 704",
-          "title" : "Databases, Programming Languages and Datastructures",
-          "semester" : "Fall 2014",
-          "enrollment" : 21 },
-        { "code" : "CSE 562", 
-          "title" : "Graduate Database Systems", 
-          "semester" : "Spring 2014",
-          "enrollment" : 148 },
-        { "code" : "CSE 704", 
-          "title" : "Streaming, Incremental and Online Data Processing", 
-          "semester" : "Fall 2013",
-          "enrollment" : 18 },
-        { "code" : "CSE 562", 
-          "title" : "Graduate Database Systems", 
-          "semester" : "Spring 2013",
-          "enrollment" : 101 },
-        { "code" : "CSE 704", 
-          "title" : "Web-Scale Data Management Systems Seminar", 
-          "semester" : "Fall 2012",
-          "enrollment" : 15 }
-      ]
-    },
-    { "venue" : "School of Computer and Communication Sciences, EPFL, Switzerland",
-      "courses" : [
-        { "code" : "CS-422",
-          "title" : "Advanced Databases",
-          "role" : "Teaching Assistant",
-          "semester" : "Spring 2011" }
-      ]
-    },
-    { "venue" : "Department of Computer Science, Cornell University",
-      "courses" : [
-        { "code" : "CS 4410", 
-          "title" : "Operating Systems", 
-          "semester" : "Fall 2008",
-          "role" : "Practicum Instructor" },
-        { "code" : "CS 414",  
-          "title" : "Operating Systems", 
-          "semester" : "Spring 2006",
-          "role" : "Practicum Instructor" },
-        { "code" : "CS 414",  
-          "title" : "Operating Systems", 
-          "semester" : "Fall 2006",
-          "role" : "Practicum Instructor" }
-      ]
-    }
-  ],
   "artifacts" : [
     {
       "name" : "DBToaster",
diff --git a/db/cv/okennedy/courses.json b/db/cv/okennedy/courses.json
new file mode 100644
index 00000000..0a7deaaa
--- /dev/null
+++ b/db/cv/okennedy/courses.json
@@ -0,0 +1,83 @@
+[
+  { "venue" : "Department of Computer Science and Engineering, SUNY Buffalo",
+    "courses" : [
+      { "code" : "CSE 562", 
+        "title" : "Graduate Database Systems (planned)", 
+        "semester" : "Spring 2018" },
+      { "code" : "CSE 662", 
+        "title" : "Languages and Runtimes for Big Data (planned)", 
+        "semester" : "Fall 2017" },
+      { "code" : "CSE 562", 
+        "title" : "Graduate Database Systems", 
+        "semester" : "Spring 2017" },
+      { "code" : "CSE 199", 
+        "title" : "Undergraduate CS Seminar Recitation", 
+        "semester" : "Fall 2016",
+        "enrollment" : 21 },
+      { "code" : "CSE 705", 
+        "title" : "Database Research Seminar", 
+        "semester" : "Fall 2016",
+        "enrollment" : 7 },
+      { "code" : "CSE 662", 
+        "title" : "Languages and Runtimes for Big Data", 
+        "semester" : "Fall 2016",
+        "enrollment" : 10 },
+      { "code" : "CSE 462", 
+        "title" : "Undergraduate Database Systems", 
+        "semester" : "Spring 2016",
+        "enrollment" : 72 },
+      { "code" : "CSE 662", 
+        "title" : "Languages and Runtimes for Big Data", 
+        "semester" : "Fall 2015",
+        "enrollment" : 29 },
+      { "code" : "CSE 562", 
+        "title" : "Graduate Database Systems", 
+        "semester" : "Spring 2015",
+        "enrollment": 79 },
+      { "code" : "CSE 704",
+        "title" : "Databases, Programming Languages and Datastructures",
+        "semester" : "Fall 2014",
+        "enrollment" : 21 },
+      { "code" : "CSE 562", 
+        "title" : "Graduate Database Systems", 
+        "semester" : "Spring 2014",
+        "enrollment" : 148 },
+      { "code" : "CSE 704", 
+        "title" : "Streaming, Incremental and Online Data Processing", 
+        "semester" : "Fall 2013",
+        "enrollment" : 18 },
+      { "code" : "CSE 562", 
+        "title" : "Graduate Database Systems", 
+        "semester" : "Spring 2013",
+        "enrollment" : 101 },
+      { "code" : "CSE 704", 
+        "title" : "Web-Scale Data Management Systems Seminar", 
+        "semester" : "Fall 2012",
+        "enrollment" : 15 }
+    ]
+  },
+  { "venue" : "School of Computer and Communication Sciences, EPFL, Switzerland",
+    "courses" : [
+      { "code" : "CS-422",
+        "title" : "Advanced Databases",
+        "role" : "Teaching Assistant",
+        "semester" : "Spring 2011" }
+    ]
+  },
+  { "venue" : "Department of Computer Science, Cornell University",
+    "courses" : [
+      { "code" : "CS 4410", 
+        "title" : "Operating Systems", 
+        "semester" : "Fall 2008",
+        "role" : "Practicum Instructor" },
+      { "code" : "CS 414",  
+        "title" : "Operating Systems", 
+        "semester" : "Spring 2006",
+        "role" : "Practicum Instructor" },
+      { "code" : "CS 414",  
+        "title" : "Operating Systems", 
+        "semester" : "Fall 2006",
+        "role" : "Practicum Instructor" }
+    ]
+  }
+]
\ No newline at end of file
diff --git a/db/cv/okennedy/talks.json b/db/cv/okennedy/talks.json
index 9a670778..83dbf42e 100644
--- a/db/cv/okennedy/talks.json
+++ b/db/cv/okennedy/talks.json
@@ -1,4 +1,6 @@
 [
+  { "talk" : "Small Data (panel moderator)", "date" : "Apr. 2017", 
+    "venue" : "ICDE" },
   { "talk" : "Embracing Uncertainty with Mimir", "date" : "Oct. 2016", 
     "venue" : "Airbus" },
   { "talk" : "Pocket Data", "date" : "Oct. 2016", 
@@ -10,11 +12,11 @@
   { "talk" : "Embracing Uncertainty with Mimir", "date" : "Mar. 2016",
     "venue" : "HPE/Vertica" },
   { "talk" : "Embracing Uncertainty with Mimir", "date" : "Feb. 2016",
-    "venue" : "Carnegie Mellon University" },
+    "venue" : "Carnegie Mellon" },
   { "talk" : "LEGO NXT Professional Development", "date" : "Jan. 2015",
     "venue" : "Buffalo District Board of Education" },
   { "talk" : "PocketData: What's in your pocket?", "date" : "Oct. 2015", 
-    "venue" : "Ohio State Computer Science Colloquium" },
+    "venue" : "Ohio State" },
   { "talk" : "Just-In-Time Data Structures", "date" : "Jan. 2015", 
     "venue" : "Oracle" },
   { "talk" : "Just-In-Time Data Structures", "date" : "Jan. 2015",