diff --git a/doc/javadoc/allclasses-frame.html b/doc/javadoc/allclasses-frame.html
index bdcf0a429b240032841cf9a6655e2c3590a0e203..f82e655c27212dc0281bdac0eff37570e0aa7f3e 100644
--- a/doc/javadoc/allclasses-frame.html
+++ b/doc/javadoc/allclasses-frame.html
@@ -2,7 +2,7 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.5.0_22) on Mon Apr 19 13:47:53 PDT 2010 -->
+<!-- Generated by javadoc (build 1.5.0_22) on Tue Apr 20 15:39:17 PDT 2010 -->
 <TITLE>
 All Classes
 </TITLE>
diff --git a/doc/javadoc/allclasses-noframe.html b/doc/javadoc/allclasses-noframe.html
index da12305b3f00d96d9f01239b4b9ad228eb86dd00..4a90f94c283b8dfefc6486a8b6dde6b706af2824 100644
--- a/doc/javadoc/allclasses-noframe.html
+++ b/doc/javadoc/allclasses-noframe.html
@@ -2,7 +2,7 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.5.0_22) on Mon Apr 19 13:47:53 PDT 2010 -->
+<!-- Generated by javadoc (build 1.5.0_22) on Tue Apr 20 15:39:17 PDT 2010 -->
 <TITLE>
 All Classes
 </TITLE>
diff --git a/doc/javadoc/com/yahoo/ycsb/BasicDB.html b/doc/javadoc/com/yahoo/ycsb/BasicDB.html
index 00b924310372958ebec197327b862706531adfac..18eb060a12e1c7885a3dabe5882847e2222417be 100644
--- a/doc/javadoc/com/yahoo/ycsb/BasicDB.html
+++ b/doc/javadoc/com/yahoo/ycsb/BasicDB.html
@@ -2,7 +2,7 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.5.0_22) on Mon Apr 19 13:47:52 PDT 2010 -->
+<!-- Generated by javadoc (build 1.5.0_22) on Tue Apr 20 15:39:16 PDT 2010 -->
 <TITLE>
 BasicDB
 </TITLE>
@@ -401,7 +401,7 @@ public int <B>update</B>(java.lang.String&nbsp;table,
 <DT><B>Specified by:</B><DD><CODE><A HREF="../../../com/yahoo/ycsb/DB.html#update(java.lang.String, java.lang.String, java.util.HashMap)">update</A></CODE> in class <CODE><A HREF="../../../com/yahoo/ycsb/DB.html" title="class in com.yahoo.ycsb">DB</A></CODE></DL>
 </DD>
 <DD><DL>
-<DT><B>Parameters:</B><DD><CODE>table</CODE> - The name of the table<DD><CODE>key</CODE> - The record key of the record to write.<DD><CODE>result</CODE> - A HashMap of field/value pairs to update in the record
+<DT><B>Parameters:</B><DD><CODE>table</CODE> - The name of the table<DD><CODE>key</CODE> - The record key of the record to write.<DD><CODE>values</CODE> - A HashMap of field/value pairs to update in the record
 <DT><B>Returns:</B><DD>Zero on success, a non-zero error code on error</DL>
 </DD>
 </DL>
@@ -421,7 +421,7 @@ public int <B>insert</B>(java.lang.String&nbsp;table,
 <DT><B>Specified by:</B><DD><CODE><A HREF="../../../com/yahoo/ycsb/DB.html#insert(java.lang.String, java.lang.String, java.util.HashMap)">insert</A></CODE> in class <CODE><A HREF="../../../com/yahoo/ycsb/DB.html" title="class in com.yahoo.ycsb">DB</A></CODE></DL>
 </DD>
 <DD><DL>
-<DT><B>Parameters:</B><DD><CODE>table</CODE> - The name of the table<DD><CODE>key</CODE> - The record key of the record to insert.<DD><CODE>result</CODE> - A HashMap of field/value pairs to insert in the record
+<DT><B>Parameters:</B><DD><CODE>table</CODE> - The name of the table<DD><CODE>key</CODE> - The record key of the record to insert.<DD><CODE>values</CODE> - A HashMap of field/value pairs to insert in the record
 <DT><B>Returns:</B><DD>Zero on success, a non-zero error code on error</DL>
 </DD>
 </DL>
diff --git a/doc/javadoc/com/yahoo/ycsb/Client.html b/doc/javadoc/com/yahoo/ycsb/Client.html
index aab5a10062da2912a0863ba7d90536246045d2d7..6ce86cc29d2c1f64fdc195c26caa8a002384cc92 100644
--- a/doc/javadoc/com/yahoo/ycsb/Client.html
+++ b/doc/javadoc/com/yahoo/ycsb/Client.html
@@ -2,7 +2,7 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.5.0_22) on Mon Apr 19 13:47:52 PDT 2010 -->
+<!-- Generated by javadoc (build 1.5.0_22) on Tue Apr 20 15:39:16 PDT 2010 -->
 <TITLE>
 Client
 </TITLE>
diff --git a/doc/javadoc/com/yahoo/ycsb/CounterGenerator.html b/doc/javadoc/com/yahoo/ycsb/CounterGenerator.html
index bb306f88d2310d0e0ccd02f64e23c45104a22880..3a32f48364ecd4bcbf8b58cf3ef49ad2061b3b2f 100644
--- a/doc/javadoc/com/yahoo/ycsb/CounterGenerator.html
+++ b/doc/javadoc/com/yahoo/ycsb/CounterGenerator.html
@@ -2,7 +2,7 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.5.0_22) on Mon Apr 19 13:47:52 PDT 2010 -->
+<!-- Generated by javadoc (build 1.5.0_22) on Tue Apr 20 15:39:16 PDT 2010 -->
 <TITLE>
 CounterGenerator
 </TITLE>
diff --git a/doc/javadoc/com/yahoo/ycsb/DB.html b/doc/javadoc/com/yahoo/ycsb/DB.html
index 2c672a11115c2426cefee2ae1c45d2b2c9b3506d..addf368f485d01e137b34d2750cd391f0bc3a130 100644
--- a/doc/javadoc/com/yahoo/ycsb/DB.html
+++ b/doc/javadoc/com/yahoo/ycsb/DB.html
@@ -2,7 +2,7 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.5.0_22) on Mon Apr 19 13:47:52 PDT 2010 -->
+<!-- Generated by javadoc (build 1.5.0_22) on Tue Apr 20 15:39:16 PDT 2010 -->
 <TITLE>
 DB
 </TITLE>
diff --git a/doc/javadoc/com/yahoo/ycsb/DBException.html b/doc/javadoc/com/yahoo/ycsb/DBException.html
index 09a60b161f20ba867c8ca4d505e35b6d103e00ba..226719bbe1d397a8bea97065d6a6fdc2a449c08c 100644
--- a/doc/javadoc/com/yahoo/ycsb/DBException.html
+++ b/doc/javadoc/com/yahoo/ycsb/DBException.html
@@ -2,7 +2,7 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.5.0_22) on Mon Apr 19 13:47:52 PDT 2010 -->
+<!-- Generated by javadoc (build 1.5.0_22) on Tue Apr 20 15:39:16 PDT 2010 -->
 <TITLE>
 DBException
 </TITLE>
diff --git a/doc/javadoc/com/yahoo/ycsb/DBFactory.html b/doc/javadoc/com/yahoo/ycsb/DBFactory.html
index ed5ecd7715fe10c910a23008004de285293d59c7..b7ceef55cf4043d39067f011d035d328cab61f82 100644
--- a/doc/javadoc/com/yahoo/ycsb/DBFactory.html
+++ b/doc/javadoc/com/yahoo/ycsb/DBFactory.html
@@ -2,7 +2,7 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.5.0_22) on Mon Apr 19 13:47:52 PDT 2010 -->
+<!-- Generated by javadoc (build 1.5.0_22) on Tue Apr 20 15:39:16 PDT 2010 -->
 <TITLE>
 DBFactory
 </TITLE>
diff --git a/doc/javadoc/com/yahoo/ycsb/DBWrapper.html b/doc/javadoc/com/yahoo/ycsb/DBWrapper.html
index 8a6731d6ecacc59db2b33d2caa10d929489bdc42..205d812bc4318ea9666eb73c9577d4d07b15a797 100644
--- a/doc/javadoc/com/yahoo/ycsb/DBWrapper.html
+++ b/doc/javadoc/com/yahoo/ycsb/DBWrapper.html
@@ -2,7 +2,7 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.5.0_22) on Mon Apr 19 13:47:52 PDT 2010 -->
+<!-- Generated by javadoc (build 1.5.0_22) on Tue Apr 20 15:39:16 PDT 2010 -->
 <TITLE>
 DBWrapper
 </TITLE>
diff --git a/doc/javadoc/com/yahoo/ycsb/DiscreteGenerator.html b/doc/javadoc/com/yahoo/ycsb/DiscreteGenerator.html
index 9b2b7d9a8e646e2042443ffda58723684bc95a7f..a3d808a14dfd1ea1979aab45a1a678e1d20e450e 100644
--- a/doc/javadoc/com/yahoo/ycsb/DiscreteGenerator.html
+++ b/doc/javadoc/com/yahoo/ycsb/DiscreteGenerator.html
@@ -2,7 +2,7 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.5.0_22) on Mon Apr 19 13:47:53 PDT 2010 -->
+<!-- Generated by javadoc (build 1.5.0_22) on Tue Apr 20 15:39:16 PDT 2010 -->
 <TITLE>
 DiscreteGenerator
 </TITLE>
diff --git a/doc/javadoc/com/yahoo/ycsb/FindGoodAB.html b/doc/javadoc/com/yahoo/ycsb/FindGoodAB.html
index 07ab138575aabbfc868660efe80eab40dd6c50d2..d9fc418f0b22f78added7242356be4943ddb1638 100644
--- a/doc/javadoc/com/yahoo/ycsb/FindGoodAB.html
+++ b/doc/javadoc/com/yahoo/ycsb/FindGoodAB.html
@@ -2,7 +2,7 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.5.0_22) on Mon Apr 19 13:47:53 PDT 2010 -->
+<!-- Generated by javadoc (build 1.5.0_22) on Tue Apr 20 15:39:16 PDT 2010 -->
 <TITLE>
 FindGoodAB
 </TITLE>
diff --git a/doc/javadoc/com/yahoo/ycsb/FindGoodScrambleVector.html b/doc/javadoc/com/yahoo/ycsb/FindGoodScrambleVector.html
index 94a8420acb9b5ce6f92f52199ed6ee0fe5ed235b..0157c76c97e2c95758af465398aeb516b0255322 100644
--- a/doc/javadoc/com/yahoo/ycsb/FindGoodScrambleVector.html
+++ b/doc/javadoc/com/yahoo/ycsb/FindGoodScrambleVector.html
@@ -2,7 +2,7 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.5.0_22) on Mon Apr 19 13:47:53 PDT 2010 -->
+<!-- Generated by javadoc (build 1.5.0_22) on Tue Apr 20 15:39:16 PDT 2010 -->
 <TITLE>
 FindGoodScrambleVector
 </TITLE>
diff --git a/doc/javadoc/com/yahoo/ycsb/Generator.html b/doc/javadoc/com/yahoo/ycsb/Generator.html
index 2cf17100e57bdbcae07e6c24cd21f93190f8ca2e..1ad19fcef5fa6fbd2b24679dd7c3cc09a9d2ee49 100644
--- a/doc/javadoc/com/yahoo/ycsb/Generator.html
+++ b/doc/javadoc/com/yahoo/ycsb/Generator.html
@@ -2,7 +2,7 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.5.0_22) on Mon Apr 19 13:47:53 PDT 2010 -->
+<!-- Generated by javadoc (build 1.5.0_22) on Tue Apr 20 15:39:16 PDT 2010 -->
 <TITLE>
 Generator
 </TITLE>
diff --git a/doc/javadoc/com/yahoo/ycsb/IntegerGenerator.html b/doc/javadoc/com/yahoo/ycsb/IntegerGenerator.html
index 33a38b3b3d16c6d85e1e126855fa2f34bc84ec7b..749d6c922514beffeda8c29ed08a03be12898074 100644
--- a/doc/javadoc/com/yahoo/ycsb/IntegerGenerator.html
+++ b/doc/javadoc/com/yahoo/ycsb/IntegerGenerator.html
@@ -2,7 +2,7 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.5.0_22) on Mon Apr 19 13:47:53 PDT 2010 -->
+<!-- Generated by javadoc (build 1.5.0_22) on Tue Apr 20 15:39:17 PDT 2010 -->
 <TITLE>
 IntegerGenerator
 </TITLE>
diff --git a/doc/javadoc/com/yahoo/ycsb/Measurements.html b/doc/javadoc/com/yahoo/ycsb/Measurements.html
index 83fb87499ee57cbc872191e4bedbc25f9a4fc2d1..522079c718a4b25f51ce8590dabede3a9c5f4dfd 100644
--- a/doc/javadoc/com/yahoo/ycsb/Measurements.html
+++ b/doc/javadoc/com/yahoo/ycsb/Measurements.html
@@ -2,7 +2,7 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.5.0_22) on Mon Apr 19 13:47:53 PDT 2010 -->
+<!-- Generated by javadoc (build 1.5.0_22) on Tue Apr 20 15:39:17 PDT 2010 -->
 <TITLE>
 Measurements
 </TITLE>
diff --git a/doc/javadoc/com/yahoo/ycsb/OneMeasurement.html b/doc/javadoc/com/yahoo/ycsb/OneMeasurement.html
index a62c80fedad4cf75f724adf1ef924eb8fcf0fa0c..40bde7d6364b0a4fea80de5881cd8cab44d43e1d 100644
--- a/doc/javadoc/com/yahoo/ycsb/OneMeasurement.html
+++ b/doc/javadoc/com/yahoo/ycsb/OneMeasurement.html
@@ -2,7 +2,7 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.5.0_22) on Mon Apr 19 13:47:53 PDT 2010 -->
+<!-- Generated by javadoc (build 1.5.0_22) on Tue Apr 20 15:39:17 PDT 2010 -->
 <TITLE>
 OneMeasurement
 </TITLE>
diff --git a/doc/javadoc/com/yahoo/ycsb/OneMeasurementHistogram.html b/doc/javadoc/com/yahoo/ycsb/OneMeasurementHistogram.html
index 74921c233900c43139d315b760d772eb25e3109c..6da502b94bbb7e85249bddc5789b9b3ab81f08a5 100644
--- a/doc/javadoc/com/yahoo/ycsb/OneMeasurementHistogram.html
+++ b/doc/javadoc/com/yahoo/ycsb/OneMeasurementHistogram.html
@@ -2,7 +2,7 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.5.0_22) on Mon Apr 19 13:47:53 PDT 2010 -->
+<!-- Generated by javadoc (build 1.5.0_22) on Tue Apr 20 15:39:17 PDT 2010 -->
 <TITLE>
 OneMeasurementHistogram
 </TITLE>
diff --git a/doc/javadoc/com/yahoo/ycsb/OneMeasurementTimeSeries.html b/doc/javadoc/com/yahoo/ycsb/OneMeasurementTimeSeries.html
index 560159f63403454aebc998a9d748fcb86d04f3cc..273213f37a6b90ccb9ef7849fc38029813250661 100644
--- a/doc/javadoc/com/yahoo/ycsb/OneMeasurementTimeSeries.html
+++ b/doc/javadoc/com/yahoo/ycsb/OneMeasurementTimeSeries.html
@@ -2,7 +2,7 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.5.0_22) on Mon Apr 19 13:47:53 PDT 2010 -->
+<!-- Generated by javadoc (build 1.5.0_22) on Tue Apr 20 15:39:17 PDT 2010 -->
 <TITLE>
 OneMeasurementTimeSeries
 </TITLE>
diff --git a/doc/javadoc/com/yahoo/ycsb/ScrambledZipfianGenerator.html b/doc/javadoc/com/yahoo/ycsb/ScrambledZipfianGenerator.html
index ba30363a8e62bed93820564bb6082a8e8de461d3..d0507a5cf37197d9d46c80fbf977e51bcef5a56c 100644
--- a/doc/javadoc/com/yahoo/ycsb/ScrambledZipfianGenerator.html
+++ b/doc/javadoc/com/yahoo/ycsb/ScrambledZipfianGenerator.html
@@ -2,7 +2,7 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.5.0_22) on Mon Apr 19 13:47:53 PDT 2010 -->
+<!-- Generated by javadoc (build 1.5.0_22) on Tue Apr 20 15:39:17 PDT 2010 -->
 <TITLE>
 ScrambledZipfianGenerator
 </TITLE>
@@ -275,7 +275,7 @@ public <B>ScrambledZipfianGenerator</B>(long&nbsp;_min,
 <DD>Create a zipfian generator for items between min and max.
 <P>
 <DL>
-<DT><B>Parameters:</B><DD><CODE>min</CODE> - The smallest integer to generate in the sequence.<DD><CODE>max</CODE> - The largest integer to generate in the sequence.</DL>
+<DT><B>Parameters:</B><DD><CODE>_min</CODE> - The smallest integer to generate in the sequence.<DD><CODE>_max</CODE> - The largest integer to generate in the sequence.</DL>
 </DL>
 
 <!-- ============ METHOD DETAIL ========== -->
diff --git a/doc/javadoc/com/yahoo/ycsb/SkewedLatestGenerator.html b/doc/javadoc/com/yahoo/ycsb/SkewedLatestGenerator.html
index 21e5079b39bb35467f71d275df3f18439a6b4615..8a2629d2d0861460f02da7868dabdd6b7debf7a7 100644
--- a/doc/javadoc/com/yahoo/ycsb/SkewedLatestGenerator.html
+++ b/doc/javadoc/com/yahoo/ycsb/SkewedLatestGenerator.html
@@ -2,7 +2,7 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.5.0_22) on Mon Apr 19 13:47:53 PDT 2010 -->
+<!-- Generated by javadoc (build 1.5.0_22) on Tue Apr 20 15:39:17 PDT 2010 -->
 <TITLE>
 SkewedLatestGenerator
 </TITLE>
diff --git a/doc/javadoc/com/yahoo/ycsb/TestCollisions.html b/doc/javadoc/com/yahoo/ycsb/TestCollisions.html
index f5cea784f87494f6788094ab3c893e2ba141b736..8356a28a6d172c472fdcf23a18816ae833870c99 100644
--- a/doc/javadoc/com/yahoo/ycsb/TestCollisions.html
+++ b/doc/javadoc/com/yahoo/ycsb/TestCollisions.html
@@ -2,7 +2,7 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.5.0_22) on Mon Apr 19 13:47:53 PDT 2010 -->
+<!-- Generated by javadoc (build 1.5.0_22) on Tue Apr 20 15:39:17 PDT 2010 -->
 <TITLE>
 TestCollisions
 </TITLE>
diff --git a/doc/javadoc/com/yahoo/ycsb/TestExpandedZipfian.html b/doc/javadoc/com/yahoo/ycsb/TestExpandedZipfian.html
index 74bb9476a04d9d7a79d122a64e9622f0f02e99f2..847a71c7052eb565647f9cd09b8422f8595c1ea4 100644
--- a/doc/javadoc/com/yahoo/ycsb/TestExpandedZipfian.html
+++ b/doc/javadoc/com/yahoo/ycsb/TestExpandedZipfian.html
@@ -2,7 +2,7 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.5.0_22) on Mon Apr 19 13:47:53 PDT 2010 -->
+<!-- Generated by javadoc (build 1.5.0_22) on Tue Apr 20 15:39:17 PDT 2010 -->
 <TITLE>
 TestExpandedZipfian
 </TITLE>
diff --git a/doc/javadoc/com/yahoo/ycsb/TestZipfian.html b/doc/javadoc/com/yahoo/ycsb/TestZipfian.html
index 28e7d9262718856ef5a385dac2fe4e65228a5aac..d0ea7113100917f062dbe2bc1de8d6054ad00859 100644
--- a/doc/javadoc/com/yahoo/ycsb/TestZipfian.html
+++ b/doc/javadoc/com/yahoo/ycsb/TestZipfian.html
@@ -2,7 +2,7 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.5.0_22) on Mon Apr 19 13:47:53 PDT 2010 -->
+<!-- Generated by javadoc (build 1.5.0_22) on Tue Apr 20 15:39:17 PDT 2010 -->
 <TITLE>
 TestZipfian
 </TITLE>
diff --git a/doc/javadoc/com/yahoo/ycsb/UniformGenerator.html b/doc/javadoc/com/yahoo/ycsb/UniformGenerator.html
index 397d2bdb31b5537ccd55fe7f9f2285f1344aa615..516d3a1dbb6fa097847b2bf8fc8ed5e9294be841 100644
--- a/doc/javadoc/com/yahoo/ycsb/UniformGenerator.html
+++ b/doc/javadoc/com/yahoo/ycsb/UniformGenerator.html
@@ -2,7 +2,7 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.5.0_22) on Mon Apr 19 13:47:53 PDT 2010 -->
+<!-- Generated by javadoc (build 1.5.0_22) on Tue Apr 20 15:39:17 PDT 2010 -->
 <TITLE>
 UniformGenerator
 </TITLE>
diff --git a/doc/javadoc/com/yahoo/ycsb/UniformIntegerGenerator.html b/doc/javadoc/com/yahoo/ycsb/UniformIntegerGenerator.html
index 72019b8fbd86f27661b0dab6bf8a0b709b45744d..fd79bfe41d508baa91944c498d38633c1c9faeb7 100644
--- a/doc/javadoc/com/yahoo/ycsb/UniformIntegerGenerator.html
+++ b/doc/javadoc/com/yahoo/ycsb/UniformIntegerGenerator.html
@@ -2,7 +2,7 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.5.0_22) on Mon Apr 19 13:47:53 PDT 2010 -->
+<!-- Generated by javadoc (build 1.5.0_22) on Tue Apr 20 15:39:17 PDT 2010 -->
 <TITLE>
 UniformIntegerGenerator
 </TITLE>
diff --git a/doc/javadoc/com/yahoo/ycsb/UnknownDBException.html b/doc/javadoc/com/yahoo/ycsb/UnknownDBException.html
index 1acad367af3b3ad775973612900372977cad5271..1f8cf44a3b5416a08042ea420330c857436109da 100644
--- a/doc/javadoc/com/yahoo/ycsb/UnknownDBException.html
+++ b/doc/javadoc/com/yahoo/ycsb/UnknownDBException.html
@@ -2,7 +2,7 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.5.0_22) on Mon Apr 19 13:47:53 PDT 2010 -->
+<!-- Generated by javadoc (build 1.5.0_22) on Tue Apr 20 15:39:17 PDT 2010 -->
 <TITLE>
 UnknownDBException
 </TITLE>
diff --git a/doc/javadoc/com/yahoo/ycsb/Utils.html b/doc/javadoc/com/yahoo/ycsb/Utils.html
index 853d45b4b9c0bcb9b5910842cf1e6bca837ff003..b328a3ed3b773260a51bd076f2190141e13aff49 100644
--- a/doc/javadoc/com/yahoo/ycsb/Utils.html
+++ b/doc/javadoc/com/yahoo/ycsb/Utils.html
@@ -2,7 +2,7 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.5.0_22) on Mon Apr 19 13:47:53 PDT 2010 -->
+<!-- Generated by javadoc (build 1.5.0_22) on Tue Apr 20 15:39:17 PDT 2010 -->
 <TITLE>
 Utils
 </TITLE>
@@ -337,7 +337,7 @@ public static int <B>FNVhash32</B>(int&nbsp;val)</PRE>
 <P>
 <DD><DL>
 <DT><B>Parameters:</B><DD><CODE>val</CODE> - The value to hash.
-<DT><B>Returns:</B><DD></DL>
+<DT><B>Returns:</B><DD>The hash value</DL>
 </DD>
 </DL>
 <HR>
@@ -351,7 +351,7 @@ public static long <B>FNVhash64</B>(long&nbsp;val)</PRE>
 <P>
 <DD><DL>
 <DT><B>Parameters:</B><DD><CODE>val</CODE> - The value to hash.
-<DT><B>Returns:</B><DD></DL>
+<DT><B>Returns:</B><DD>The hash value</DL>
 </DD>
 </DL>
 <!-- ========= END OF CLASS DATA ========= -->
diff --git a/doc/javadoc/com/yahoo/ycsb/Workload.html b/doc/javadoc/com/yahoo/ycsb/Workload.html
index 01348c7774a89e0223228557c77125e3befc3fbb..f41f8bc7bb019c77288bb0974cf8aeff9d3d3b10 100644
--- a/doc/javadoc/com/yahoo/ycsb/Workload.html
+++ b/doc/javadoc/com/yahoo/ycsb/Workload.html
@@ -2,7 +2,7 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.5.0_22) on Mon Apr 19 13:47:53 PDT 2010 -->
+<!-- Generated by javadoc (build 1.5.0_22) on Tue Apr 20 15:39:17 PDT 2010 -->
 <TITLE>
 Workload
 </TITLE>
diff --git a/doc/javadoc/com/yahoo/ycsb/WorkloadException.html b/doc/javadoc/com/yahoo/ycsb/WorkloadException.html
index 668bec9e6dc09d83b7924087e91f85a274788347..353387577f1e50b5ec5cd66e57c29918a28c49b8 100644
--- a/doc/javadoc/com/yahoo/ycsb/WorkloadException.html
+++ b/doc/javadoc/com/yahoo/ycsb/WorkloadException.html
@@ -2,7 +2,7 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.5.0_22) on Mon Apr 19 13:47:53 PDT 2010 -->
+<!-- Generated by javadoc (build 1.5.0_22) on Tue Apr 20 15:39:17 PDT 2010 -->
 <TITLE>
 WorkloadException
 </TITLE>
diff --git a/doc/javadoc/com/yahoo/ycsb/ZipfianGenerator.html b/doc/javadoc/com/yahoo/ycsb/ZipfianGenerator.html
index 8e07753c98603c4590805277dc8319ed68f769c3..9d67ffdb6e87a2087d1c8c99abc03745f99958cc 100644
--- a/doc/javadoc/com/yahoo/ycsb/ZipfianGenerator.html
+++ b/doc/javadoc/com/yahoo/ycsb/ZipfianGenerator.html
@@ -2,7 +2,7 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.5.0_22) on Mon Apr 19 13:47:53 PDT 2010 -->
+<!-- Generated by javadoc (build 1.5.0_22) on Tue Apr 20 15:39:17 PDT 2010 -->
 <TITLE>
 ZipfianGenerator
 </TITLE>
@@ -304,7 +304,7 @@ public <B>ZipfianGenerator</B>(long&nbsp;_min,
 <DD>Create a zipfian generator for items between min and max.
 <P>
 <DL>
-<DT><B>Parameters:</B><DD><CODE>min</CODE> - The smallest integer to generate in the sequence.<DD><CODE>max</CODE> - The largest integer to generate in the sequence.</DL>
+<DT><B>Parameters:</B><DD><CODE>_min</CODE> - The smallest integer to generate in the sequence.<DD><CODE>_max</CODE> - The largest integer to generate in the sequence.</DL>
 </DL>
 <HR>
 
diff --git a/doc/javadoc/com/yahoo/ycsb/package-frame.html b/doc/javadoc/com/yahoo/ycsb/package-frame.html
index 0ce4029f165fe2c2ea3fb3ab8bfbfa97b9514823..fb138b316e98874459ae142bd2792f46ef01c1fe 100644
--- a/doc/javadoc/com/yahoo/ycsb/package-frame.html
+++ b/doc/javadoc/com/yahoo/ycsb/package-frame.html
@@ -2,7 +2,7 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.5.0_22) on Mon Apr 19 13:47:53 PDT 2010 -->
+<!-- Generated by javadoc (build 1.5.0_22) on Tue Apr 20 15:39:17 PDT 2010 -->
 <TITLE>
 com.yahoo.ycsb
 </TITLE>
diff --git a/doc/javadoc/com/yahoo/ycsb/package-summary.html b/doc/javadoc/com/yahoo/ycsb/package-summary.html
index a0c68fa6fbfadde5221c44e45060a2151045d2e7..7ab0dfb17cc3e3f7b64a9e6699abfe20dca2483b 100644
--- a/doc/javadoc/com/yahoo/ycsb/package-summary.html
+++ b/doc/javadoc/com/yahoo/ycsb/package-summary.html
@@ -2,7 +2,7 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.5.0_22) on Mon Apr 19 13:47:53 PDT 2010 -->
+<!-- Generated by javadoc (build 1.5.0_22) on Tue Apr 20 15:39:17 PDT 2010 -->
 <TITLE>
 com.yahoo.ycsb
 </TITLE>
diff --git a/doc/javadoc/com/yahoo/ycsb/package-tree.html b/doc/javadoc/com/yahoo/ycsb/package-tree.html
index c33767d62fdac38abb304868be819c67bb4226db..90944fc4e1e85d70d870425342ee298ac69f17f2 100644
--- a/doc/javadoc/com/yahoo/ycsb/package-tree.html
+++ b/doc/javadoc/com/yahoo/ycsb/package-tree.html
@@ -2,7 +2,7 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.5.0_22) on Mon Apr 19 13:47:53 PDT 2010 -->
+<!-- Generated by javadoc (build 1.5.0_22) on Tue Apr 20 15:39:17 PDT 2010 -->
 <TITLE>
 com.yahoo.ycsb Class Hierarchy
 </TITLE>
diff --git a/doc/javadoc/com/yahoo/ycsb/workloads/CoreWorkload.html b/doc/javadoc/com/yahoo/ycsb/workloads/CoreWorkload.html
index f037b641cb4ac4d5c9e249b33b9de180e10fe663..0c19121e68b006656835776881a522708d43de9e 100644
--- a/doc/javadoc/com/yahoo/ycsb/workloads/CoreWorkload.html
+++ b/doc/javadoc/com/yahoo/ycsb/workloads/CoreWorkload.html
@@ -2,7 +2,7 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.5.0_22) on Mon Apr 19 13:47:53 PDT 2010 -->
+<!-- Generated by javadoc (build 1.5.0_22) on Tue Apr 20 15:39:17 PDT 2010 -->
 <TITLE>
 CoreWorkload
 </TITLE>
diff --git a/doc/javadoc/com/yahoo/ycsb/workloads/package-frame.html b/doc/javadoc/com/yahoo/ycsb/workloads/package-frame.html
index 1e5dc5ab9094c5cc87478edbf155e23ebd0815f7..0147c99b74d1e0d945b9d7ff8716db4498129344 100644
--- a/doc/javadoc/com/yahoo/ycsb/workloads/package-frame.html
+++ b/doc/javadoc/com/yahoo/ycsb/workloads/package-frame.html
@@ -2,7 +2,7 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.5.0_22) on Mon Apr 19 13:47:53 PDT 2010 -->
+<!-- Generated by javadoc (build 1.5.0_22) on Tue Apr 20 15:39:17 PDT 2010 -->
 <TITLE>
 com.yahoo.ycsb.workloads
 </TITLE>
diff --git a/doc/javadoc/com/yahoo/ycsb/workloads/package-summary.html b/doc/javadoc/com/yahoo/ycsb/workloads/package-summary.html
index 3d59b5d1264cad8ef33d3e67e5cdc27109a6c3db..267df3d2426479b5b661c1cd7a7ea14630c97c7a 100644
--- a/doc/javadoc/com/yahoo/ycsb/workloads/package-summary.html
+++ b/doc/javadoc/com/yahoo/ycsb/workloads/package-summary.html
@@ -2,7 +2,7 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.5.0_22) on Mon Apr 19 13:47:53 PDT 2010 -->
+<!-- Generated by javadoc (build 1.5.0_22) on Tue Apr 20 15:39:17 PDT 2010 -->
 <TITLE>
 com.yahoo.ycsb.workloads
 </TITLE>
diff --git a/doc/javadoc/com/yahoo/ycsb/workloads/package-tree.html b/doc/javadoc/com/yahoo/ycsb/workloads/package-tree.html
index e244f1563dd129a48f82ee016154ec0fc2dd62fd..7aac189f2143b03b9a0001dfb46f1cfe81fbc274 100644
--- a/doc/javadoc/com/yahoo/ycsb/workloads/package-tree.html
+++ b/doc/javadoc/com/yahoo/ycsb/workloads/package-tree.html
@@ -2,7 +2,7 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.5.0_22) on Mon Apr 19 13:47:53 PDT 2010 -->
+<!-- Generated by javadoc (build 1.5.0_22) on Tue Apr 20 15:39:17 PDT 2010 -->
 <TITLE>
 com.yahoo.ycsb.workloads Class Hierarchy
 </TITLE>
diff --git a/doc/javadoc/constant-values.html b/doc/javadoc/constant-values.html
index 8ebb7083a35c9a561c8fcb744b8771702c94b5cf..33180e82fd5380b9b265abcf7c3ed88ec1bd245e 100644
--- a/doc/javadoc/constant-values.html
+++ b/doc/javadoc/constant-values.html
@@ -2,7 +2,7 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.5.0_22) on Mon Apr 19 13:47:53 PDT 2010 -->
+<!-- Generated by javadoc (build 1.5.0_22) on Tue Apr 20 15:39:17 PDT 2010 -->
 <TITLE>
 Constant Field Values
 </TITLE>
diff --git a/doc/javadoc/deprecated-list.html b/doc/javadoc/deprecated-list.html
index 573b85304dbf6f7e61a8465ab9c6160f228b2a45..a4461ef02c1ca1073347de03ba3337ccf8496fa2 100644
--- a/doc/javadoc/deprecated-list.html
+++ b/doc/javadoc/deprecated-list.html
@@ -2,7 +2,7 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.5.0_22) on Mon Apr 19 13:47:53 PDT 2010 -->
+<!-- Generated by javadoc (build 1.5.0_22) on Tue Apr 20 15:39:17 PDT 2010 -->
 <TITLE>
 Deprecated List
 </TITLE>
diff --git a/doc/javadoc/help-doc.html b/doc/javadoc/help-doc.html
index c3db9047a3718fc55eae5f914025de37d451d15c..7c5b7894bd37fdf3be664715a29eaf497f1371a3 100644
--- a/doc/javadoc/help-doc.html
+++ b/doc/javadoc/help-doc.html
@@ -2,7 +2,7 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.5.0_22) on Mon Apr 19 13:47:53 PDT 2010 -->
+<!-- Generated by javadoc (build 1.5.0_22) on Tue Apr 20 15:39:17 PDT 2010 -->
 <TITLE>
 API Help
 </TITLE>
diff --git a/doc/javadoc/index-all.html b/doc/javadoc/index-all.html
index 7122b00f14e6a90e36ed8e8d96dc37908010181f..eaf4193cfe0dd5e95e1ae60d02d33f76e77d0754 100644
--- a/doc/javadoc/index-all.html
+++ b/doc/javadoc/index-all.html
@@ -2,7 +2,7 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.5.0_22) on Mon Apr 19 13:47:53 PDT 2010 -->
+<!-- Generated by javadoc (build 1.5.0_22) on Tue Apr 20 15:39:17 PDT 2010 -->
 <TITLE>
 Index
 </TITLE>
diff --git a/doc/javadoc/index.html b/doc/javadoc/index.html
index b6a9696e42c70ed8676408b1939d0a3a72a97761..73dd22fb3f67dcdcfbbd387f5f79aa980f5bb116 100644
--- a/doc/javadoc/index.html
+++ b/doc/javadoc/index.html
@@ -2,7 +2,7 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc on Mon Apr 19 13:47:53 PDT 2010-->
+<!-- Generated by javadoc on Tue Apr 20 15:39:17 PDT 2010-->
 <TITLE>
 Generated Documentation (Untitled)
 </TITLE>
diff --git a/doc/javadoc/overview-frame.html b/doc/javadoc/overview-frame.html
index 53032410e418e8a5a06d1c59935d03940262265a..16507ee7c5bf0e52df2b3aaddab92070bd7debeb 100644
--- a/doc/javadoc/overview-frame.html
+++ b/doc/javadoc/overview-frame.html
@@ -2,7 +2,7 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.5.0_22) on Mon Apr 19 13:47:53 PDT 2010 -->
+<!-- Generated by javadoc (build 1.5.0_22) on Tue Apr 20 15:39:17 PDT 2010 -->
 <TITLE>
 Overview
 </TITLE>
diff --git a/doc/javadoc/overview-summary.html b/doc/javadoc/overview-summary.html
index a7817b61298d87b98eaf606f14d0d742e7093bb0..09c5b14d8263fec76909a62baf29b09fcfa8d1aa 100644
--- a/doc/javadoc/overview-summary.html
+++ b/doc/javadoc/overview-summary.html
@@ -2,7 +2,7 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.5.0_22) on Mon Apr 19 13:47:53 PDT 2010 -->
+<!-- Generated by javadoc (build 1.5.0_22) on Tue Apr 20 15:39:17 PDT 2010 -->
 <TITLE>
 Overview
 </TITLE>
diff --git a/doc/javadoc/overview-tree.html b/doc/javadoc/overview-tree.html
index be8992ca33d3d165ecb41efa8541304b012bb110..0a2352600208e9023fd275b2fafa2b1bdc69abf3 100644
--- a/doc/javadoc/overview-tree.html
+++ b/doc/javadoc/overview-tree.html
@@ -2,7 +2,7 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.5.0_22) on Mon Apr 19 13:47:53 PDT 2010 -->
+<!-- Generated by javadoc (build 1.5.0_22) on Tue Apr 20 15:39:17 PDT 2010 -->
 <TITLE>
 Class Hierarchy
 </TITLE>
diff --git a/doc/javadoc/serialized-form.html b/doc/javadoc/serialized-form.html
index 83b72eb7782e2989560cb6c5753d5af7c5e7753a..4b2f347a4156b931bab72b040ee37a4034762c32 100644
--- a/doc/javadoc/serialized-form.html
+++ b/doc/javadoc/serialized-form.html
@@ -2,7 +2,7 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.5.0_22) on Mon Apr 19 13:47:53 PDT 2010 -->
+<!-- Generated by javadoc (build 1.5.0_22) on Tue Apr 20 15:39:17 PDT 2010 -->
 <TITLE>
 Serialized Form
 </TITLE>
diff --git a/src/com/yahoo/ycsb/BasicDB.java b/src/com/yahoo/ycsb/BasicDB.java
index 8f68049aebf37543e3a97b9fd346e8ee23022910..19d626732ee04cc9bf8de651066d1c8af85064ad 100644
--- a/src/com/yahoo/ycsb/BasicDB.java
+++ b/src/com/yahoo/ycsb/BasicDB.java
@@ -164,7 +164,7 @@ public class BasicDB extends DB
 	 *
 	 * @param table The name of the table
 	 * @param key The record key of the record to write.
-	 * @param result A HashMap of field/value pairs to update in the record
+	 * @param values A HashMap of field/value pairs to update in the record
 	 * @return Zero on success, a non-zero error code on error
 	 */
 	public int update(String table, String key, HashMap<String,String> values)
@@ -193,7 +193,7 @@ public class BasicDB extends DB
 	 *
 	 * @param table The name of the table
 	 * @param key The record key of the record to insert.
-	 * @param result A HashMap of field/value pairs to insert in the record
+	 * @param values A HashMap of field/value pairs to insert in the record
 	 * @return Zero on success, a non-zero error code on error
 	 */
 	public int insert(String table, String key, HashMap<String,String> values)
diff --git a/src/com/yahoo/ycsb/ScrambledZipfianGenerator.java b/src/com/yahoo/ycsb/ScrambledZipfianGenerator.java
index 39fbbaefa4f89e0f04c898fdcaaf8bd27ce055af..4c1b878e95868ae580f30a438ca64b234b981a58 100644
--- a/src/com/yahoo/ycsb/ScrambledZipfianGenerator.java
+++ b/src/com/yahoo/ycsb/ScrambledZipfianGenerator.java
@@ -47,8 +47,8 @@ public class ScrambledZipfianGenerator extends IntegerGenerator
 
 	/**
 	 * Create a zipfian generator for items between min and max.
-	 * @param min The smallest integer to generate in the sequence.
-	 * @param max The largest integer to generate in the sequence.
+	 * @param _min The smallest integer to generate in the sequence.
+	 * @param _max The largest integer to generate in the sequence.
 	 */
 	public ScrambledZipfianGenerator(long _min, long _max)
 	{
diff --git a/src/com/yahoo/ycsb/Utils.java b/src/com/yahoo/ycsb/Utils.java
index 3c79412f7f7e2e7f4c9868d3fef8b61a16fe2677..33bee0651c4fdf71694929d38f58466882b5b5a4 100644
--- a/src/com/yahoo/ycsb/Utils.java
+++ b/src/com/yahoo/ycsb/Utils.java
@@ -69,7 +69,7 @@ public class Utils
 	 * 32 bit FNV hash. Produces more "random" hashes than (say) String.hashCode().
 	 * 
 	 * @param val The value to hash.
-	 * @return
+	 * @return The hash value
 	 */
 	public static int FNVhash32(int val)
 	{
@@ -95,7 +95,7 @@ public class Utils
 	 * 64 bit FNV hash. Produces more "random" hashes than (say) String.hashCode().
 	 * 
 	 * @param val The value to hash.
-	 * @return
+	 * @return The hash value
 	 */
 	public static long FNVhash64(long val)
 	{
diff --git a/src/com/yahoo/ycsb/ZipfianGenerator.java b/src/com/yahoo/ycsb/ZipfianGenerator.java
index 25b2d69f82b5319288e7504231efdae8f0e398ad..4666729bb0486fa6e91b12ef170ebad81b81f6e9 100644
--- a/src/com/yahoo/ycsb/ZipfianGenerator.java
+++ b/src/com/yahoo/ycsb/ZipfianGenerator.java
@@ -89,8 +89,8 @@ public class ZipfianGenerator extends IntegerGenerator
 
 	/**
 	 * Create a zipfian generator for items between min and max.
-	 * @param min The smallest integer to generate in the sequence.
-	 * @param max The largest integer to generate in the sequence.
+	 * @param _min The smallest integer to generate in the sequence.
+	 * @param _max The largest integer to generate in the sequence.
 	 */
 	public ZipfianGenerator(long _min, long _max)
 	{